Commit graph

14212 commits

Author SHA1 Message Date
Colin Cross
1fe8e3c66d Merge "Move jacocoagent into the bootclasspath" am: 68dad73d34 am: a6af8ef91f
am: e9a7688567

Change-Id: I8941916da85a2c221c5ac7d6bb5217bd9b79baef
2017-09-18 20:32:10 +00:00
Colin Cross
e9a7688567 Merge "Move jacocoagent into the bootclasspath" am: 68dad73d34
am: a6af8ef91f

Change-Id: I3fba1c3005056354a682e1e424fbb4f388cc16ab
2017-09-18 20:12:05 +00:00
Colin Cross
a6af8ef91f Merge "Move jacocoagent into the bootclasspath"
am: 68dad73d34

Change-Id: I67cda4a8aefee7cdb946e4e3181f3254a2994ebc
2017-09-18 20:08:08 +00:00
Treehugger Robot
68dad73d34 Merge "Move jacocoagent into the bootclasspath" 2017-09-18 19:57:53 +00:00
Nicolas Geoffray
ad97c9d963 Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04 am: ed7dab7625
am: 7c1b5d08d4

Change-Id: I6c71407f2504ccb8bde2ad121dc9574afe32c02d
2017-09-18 15:25:32 +00:00
Nicolas Geoffray
7c1b5d08d4 Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04
am: ed7dab7625

Change-Id: Ie9f53fbd629534f3bcf7f62b5ace3832d17a142e
2017-09-18 15:22:31 +00:00
Nicolas Geoffray
ed7dab7625 Merge "Revert "Make privileged apps always keep uncompressed dex files.""
am: bb779a0c04

Change-Id: I9618966e0946ec5a296d205cc303add14bec0d79
2017-09-18 15:20:00 +00:00
Nicolas Geoffray
bb779a0c04 Merge "Revert "Make privileged apps always keep uncompressed dex files."" 2017-09-18 15:11:09 +00:00
Nicolas Geoffray
f69441b76b Revert "Make privileged apps always keep uncompressed dex files."
Broke Fugu build. Will work on a workaround for it.

bug: 30972906
bug: 63920015

This reverts commit 09dfe6739a.

Change-Id: I5a8b8de4ec98ae44808762ca1ba974ce89bebb05
2017-09-18 15:07:26 +00:00
Nicolas Geoffray
55c81cea3e Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f am: 65c8bc6695
am: 4ad5bbb35d

Change-Id: I669e96d79fc5dd7247ac75b6defe856ec74fe6d6
2017-09-18 09:31:10 +00:00
Nicolas Geoffray
4ad5bbb35d Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f
am: 65c8bc6695

Change-Id: If3c942d070db8423d9e45218cfc73bbe389b5648
2017-09-18 09:28:39 +00:00
Nicolas Geoffray
65c8bc6695 Merge "Make privileged apps always keep uncompressed dex files."
am: 3a5c65ef2f

Change-Id: I3c734aa91fd530120633f8626717c9857579eee4
2017-09-18 09:26:09 +00:00
Nicolas Geoffray
3a5c65ef2f Merge "Make privileged apps always keep uncompressed dex files." 2017-09-18 09:21:53 +00:00
Nan Zhang
0d3dcc62c7 Merge "Move classes.jar generation right below JarJar phase." am: 729a221a16 am: 32fc9a5c46
am: 46010dda39

Change-Id: Iea2acd5e5fc736ef933b1d50e1ca39c7c7890e19
2017-09-15 22:47:03 +00:00
Colin Cross
69b7f3f0b1 Move jacocoagent into the bootclasspath
Move jacocoagent out of core-libart and into its own jar on the
bootclasspath.

Test: m -j EMMA_INSTRUMENT=true
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L19400000103297394&nodeType=Trybot
Change-Id: I9e6e3dc59dba8b93685d59b258d4ebc7835eab8b
2017-09-15 22:27:35 +00:00
Nicolas Geoffray
09dfe6739a Make privileged apps always keep uncompressed dex files.
To ensure the verified boot work does not make ART run
dex code uncompressed in memory, make the build system
generate uncompressed dex files in APKs.

The alignment of STORE files in an APK is already handled.

bug: 30972906
bug: 63920015

Test: doing zipinfo on the produced apks after build.
Change-Id: I0ccdeae5d674b2a409a1343c4a14699c7bf0defb
2017-09-15 21:49:05 +01:00
Nan Zhang
46010dda39 Merge "Move classes.jar generation right below JarJar phase." am: 729a221a16
am: 32fc9a5c46

Change-Id: I891f675d7f6f5761b213e96845ced4e263bd059d
2017-09-15 20:18:20 +00:00
Nan Zhang
32fc9a5c46 Merge "Move classes.jar generation right below JarJar phase."
am: 729a221a16

Change-Id: I65352f033cdb64dd08dc1e0ab82bc2bbec6e8591
2017-09-15 20:13:18 +00:00
Jeff Gaston
593caca87d resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
am: c5fa0e7f49

Change-Id: I4ccd716b8b49edd683f7eead845efc4e0f65e857
2017-09-15 20:12:54 +00:00
Jeff Gaston
c5fa0e7f49 resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Id2d18fe41de5d533baf1f082292d70d946386249
Change-Id: Ibc66733eb7879f2be2458e922641fec3a899beab
2017-09-15 19:25:19 +00:00
Jeff Gaston
c09b693857 Fix sdk-addon for absolute OUT_DIR
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-14 17:16:32 -07:00
Nan Zhang
870025f89b Move classes.jar generation right below JarJar phase.
By doing this, we don't need run desugar/Jacoco/proguard twice for
static java libraries(one for their self build, another for downstream
dependents).

Test: m clean && m java
Bug: b/65455145
Change-Id: I87aee34940937dbde33a977f55d1faf2c8054561
2017-09-14 14:44:40 -07:00
Jeff Gaston
43f3457329 Fix sdk-addon for absolute OUT_DIR
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-13 15:23:38 -07:00
Adam Seaton
c6f2363c5e Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
am: db4b460d4b

Change-Id: I60112d1f0980ad0707ddf757735d73e62b4d7817
2017-09-13 22:15:19 +00:00
Adam Seaton
eb202ed342 Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb
am: 813eb5e81d

Change-Id: Ib1cb2b5d8789b8b43de101786ceb00d98e156afa
2017-09-13 22:15:05 +00:00
Adam Seaton
db4b460d4b Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Ia0a597ebe1b74390761e51481cf90a20e6376b31
2017-09-13 21:56:15 +00:00
Adam Seaton
813eb5e81d Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: Icd9ef222b91081a89b386d124eeed39d0caa6df8
2017-09-13 21:56:02 +00:00
Adam Seaton
6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Adam Seaton
d24487a2f2 Update Security String to 2017-11-05 on oc-dev bug:65631379 2017-09-13 10:51:18 -07:00
Adam Seaton
8f4a4c2131 Update Security String to 2017-11-01 on oc-dev bug:65631379 2017-09-13 10:46:41 -07:00
Colin Cross
df6970b8f7 Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161 am: ec6ba0d686
am: 380d3af42f

Change-Id: I3b2834eaa62156518a1e5997a88278280e20777a
2017-09-09 01:43:34 +00:00
Colin Cross
ec6ba0d686 Merge "Make -ldl -lrt -lpthread implicit for host builds"
am: 952f1e5161

Change-Id: I4b540ee6dd2f9f858afc95d6ade27a6f9df1a05a
2017-09-09 01:36:02 +00:00
Treehugger Robot
952f1e5161 Merge "Make -ldl -lrt -lpthread implicit for host builds" 2017-09-09 01:32:23 +00:00
Dan Willemsen
29fca0148b Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7 am: e931e59dc6
am: bf9c5c393a

Change-Id: Id1df276d094a94a265561f43ad572b6ba08d7cbd
2017-09-08 23:56:35 +00:00
Dan Willemsen
e931e59dc6 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications"
am: c9916ddbd7

Change-Id: Ide09d043908f9289d9e487ed225b3823e8773b55
2017-09-08 23:48:14 +00:00
Colin Cross
0bd335f9b0 Make -ldl -lrt -lpthread implicit for host builds
Instead of requiring every host module to specify -ldl -lrt -lpthread
and then break the mac build because -lrt doesn't exist, make them
implicit to match the behavior of modules built for the device.

Test: m -j checkbuild
Change-Id: I7b5b5289a41cd8f6e7dc2da59400955d867ee783
2017-09-08 16:43:55 -07:00
Treehugger Robot
c9916ddbd7 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" 2017-09-08 23:40:36 +00:00
Dan Willemsen
d6ed368fde Remove (TARGET|HOST)_BUILD_TYPE path modifications
They don't really affect anything general in android except for the
output path. Debug builds have been broken due to Soong not respecting
*_BUILD_TYPE, and with ninja, we'll properly rebuild if you switch
between release and debug flags. So just remove the path difference.

Bug: 65453318
Test: TARGET_BUILD_TYPE=debug m
Test: code search to find all the users
Change-Id: I5c6a322e0187d96cdaeef891778508c698f841e0
2017-09-08 14:33:34 -07:00
Jaekyun Seok
46209f9493 Merge "Support excluding overlays when enforcing RRO" am: 28e1862411 am: 97361fd9c3
am: 010d18d04b

Change-Id: I494c92717c23a456d1a149d3b7e076a5a64dc168
2017-09-08 03:44:14 +00:00
Jaekyun Seok
97361fd9c3 Merge "Support excluding overlays when enforcing RRO"
am: 28e1862411

Change-Id: I6b494a84e9087460e4eadb14cf44c33c820b15e9
2017-09-08 03:34:15 +00:00
Treehugger Robot
28e1862411 Merge "Support excluding overlays when enforcing RRO" 2017-09-08 03:21:26 +00:00
Jaekyun Seok
ccee95e6ec Support excluding overlays when enforcing RRO
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays
to be excluded from enforcing RRO.

The excluded overlays will be applied into the original package.

Bug: 63600240
Bug: 65001751
Test: succeeded building with
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \
    vendor/google/google_overlay/static_only \
    vendor/google/nexus_overlay/common/static_only
and confirmed that config_webview_packages existed in framework-res.apk
with the overlayed value, but not in framework-res__auto_generated_rro.apk.

Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
2017-09-08 10:00:46 +09:00
Colin Cross
641b827c11 Merge "Use soong_java_prebuilt.mk to export soong jars to java" am: 11d1c9b02f am: 5d97be5117
am: 7fe5054cd9

Change-Id: I0a24020fd572bd98e029e066839459e2deaaa58a
2017-09-07 23:16:31 +00:00
Colin Cross
5d97be5117 Merge "Use soong_java_prebuilt.mk to export soong jars to java"
am: 11d1c9b02f

Change-Id: Ibf5f7f85fbc5f10c8205f32dee8d9ca06164c783
2017-09-07 23:06:58 +00:00
Colin Cross
be1f792a83 Use soong_java_prebuilt.mk to export soong jars to java
Instead of trying to squeeze soong jars through prebuilt_internal.mk,
make a separate soong_java_prebuilt.mk.

Test: m -j checkbuild
Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-07 13:46:02 -07:00
Ian Pedowitz
21873fbd4f Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
2017-09-07 14:50:05 +00:00
Ian Pedowitz
62a835d0ef DO NOT MERGE OC-MR1 is REL
Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
2017-09-06 13:12:42 -07:00
Michael Schwartz
dcfe8aa775 Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev
am: c5027d6e7d

Change-Id: Ie8ec82820946766aea85a43757f0507a42ea0ef9
2017-09-06 16:58:37 +00:00
Michael Schwartz
c5027d6e7d Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev 2017-09-06 16:47:32 +00:00