Nan Zhang
177e7ffb20
Merge "Use merge_zips to merge jars during Java build in Make." am: 39bbfe217a
...
am: d9001d2733
2017-09-20 19:58:17 +00:00
Nan Zhang
d9001d2733
Merge "Use merge_zips to merge jars during Java build in Make."
...
am: 39bbfe217a
2017-09-20 19:53:47 +00:00
Nan Zhang
39bbfe217a
Merge "Use merge_zips to merge jars during Java build in Make."
2017-09-20 19:48:27 +00:00
Nicolas Geoffray
3c36897dbc
Merge "Revert "Revert "Make privileged apps always keep uncompressed dex files.""" am: 121fe5a80a
...
am: 279df08f3b
2017-09-20 08:55:03 +00:00
Nicolas Geoffray
279df08f3b
Merge "Revert "Revert "Make privileged apps always keep uncompressed dex files."""
...
am: 121fe5a80a
2017-09-20 08:51:24 +00:00
Nicolas Geoffray
121fe5a80a
Merge "Revert "Revert "Make privileged apps always keep uncompressed dex files."""
2017-09-20 08:19:23 +00:00
Nan Zhang
9bd540594d
Use merge_zips to merge jars during Java build in Make.
...
1. Use merge_zips to merge jars without unzipping/rezipping static Java
libraries. And seperate merging process as a independent Make target so
that Javac can only depend on Turbine.
2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk
3. Also use classes-header.jar for link_apk & link_instr
Bug: b/65455145
Test: m clean && m -j32
Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
2017-09-19 18:49:33 -07:00
Jeff Gaston
e39d134881
Merge "Fix sdk-addon build on build servers" am: 70d8dbc125 -s ours
...
am: 878d03842f
2017-09-19 21:59:24 +00:00
Jeff Gaston
878d03842f
Merge "Fix sdk-addon build on build servers"
...
am: 70d8dbc125
2017-09-19 21:57:50 +00:00
Jeff Gaston
70d8dbc125
Merge "Fix sdk-addon build on build servers"
2017-09-19 21:35:41 +00:00
Jeff Gaston
1a024dbb89
Merge "Fix sdk-addon build on build servers" into stage-aosp-master
...
am: 7a8ab7e279
2017-09-19 19:22:11 +00:00
Jeff Gaston
7a8ab7e279
Merge "Fix sdk-addon build on build servers" into stage-aosp-master
2017-09-19 19:16:13 +00:00
Colin Cross
5da4706ab5
Merge "Revert "Upgrade to ManifestMerger2"" am: c165d9c9ba
...
am: a541eaa665
2017-09-19 15:50:25 +00:00
Colin Cross
a541eaa665
Merge "Revert "Upgrade to ManifestMerger2""
...
am: c165d9c9ba
2017-09-19 15:48:24 +00:00
Colin Cross
c165d9c9ba
Merge "Revert "Upgrade to ManifestMerger2""
2017-09-19 15:41:15 +00:00
Colin Cross
34054eb615
Revert "Upgrade to ManifestMerger2"
...
This reverts commit a636f16b34
2017-09-19 15:40:25 +00:00
Nicolas Geoffray
b06c30b480
Revert "Revert "Make privileged apps always keep uncompressed dex files.""
...
bug: 30972906
bug: 63920015
Test: doing zipinfo on the produced apks after build.
Test: fugu build
This reverts commit f69441b76b
2017-09-19 13:09:27 +01:00
Colin Cross
26eba4fb80
Merge "Upgrade to ManifestMerger2" am: 4971146b2b
...
am: 8304b5732a
2017-09-19 06:52:18 +00:00
Colin Cross
8304b5732a
Merge "Upgrade to ManifestMerger2"
...
am: 4971146b2b
2017-09-19 06:44:19 +00:00
Colin Cross
4971146b2b
Merge "Upgrade to ManifestMerger2"
2017-09-19 06:39:23 +00:00
Jeff Gaston
f32467dac6
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
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.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
Merged-In: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
(cherry picked from commit 25210ce70b
2017-09-18 19:27:13 -07:00
Jeff Gaston
8228d37ac4
Fix sdk-addon build on build servers
...
they don't source envsetup.sh
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.$(whoami)-linux-x86.zip
Change-Id: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
Merged-In: Id396203b500e70cfa2b1e1eb5241d88fae88fc36
(cherry picked from commit 25210ce70b
2017-09-18 19:13:49 -07:00
Colin Cross
a636f16b34
Upgrade to ManifestMerger2
...
Switch to using ManifestMerger2 from
prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar
Bug: 36005379
Test: m -j checkbuild
Change-Id: Ia03a1eb096ebab9578e5b08183faa86f6818ff3c
Merged-In: I83bd3f95778e93796d06f063aa7c61d2a63b117b
(cherry picked from commit e76e8021eb
2017-09-18 21:08:58 +00:00
Colin Cross
e9a7688567
Merge "Move jacocoagent into the bootclasspath" am: 68dad73d34
...
am: a6af8ef91f
2017-09-18 20:12:05 +00:00
Colin Cross
a6af8ef91f
Merge "Move jacocoagent into the bootclasspath"
...
am: 68dad73d34
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
7c1b5d08d4
Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04
...
am: ed7dab7625
2017-09-18 15:22:31 +00:00
Nicolas Geoffray
ed7dab7625
Merge "Revert "Make privileged apps always keep uncompressed dex files.""
...
am: bb779a0c04
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
2017-09-18 15:07:26 +00:00
Nicolas Geoffray
4ad5bbb35d
Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f
...
am: 65c8bc6695
2017-09-18 09:28:39 +00:00
Nicolas Geoffray
65c8bc6695
Merge "Make privileged apps always keep uncompressed dex files."
...
am: 3a5c65ef2f
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
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
2017-09-15 20:18:20 +00:00
Nan Zhang
32fc9a5c46
Merge "Move classes.jar generation right below JarJar phase."
...
am: 729a221a16
2017-09-15 20:13:18 +00:00
Jeff Gaston
593caca87d
resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master
...
am: c5fa0e7f49
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
Treehugger Robot
729a221a16
Merge "Move classes.jar generation right below JarJar phase."
2017-09-15 17:53:23 +00:00
Tao Bao
14532296a2
Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev
...
am: 0bf9b22866
2017-09-15 13:46:25 +00:00
TreeHugger Robot
0bf9b22866
Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev
2017-09-15 13:42:18 +00: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
8bbbd87ef6
Merge "Fix sdk-addon for absolute OUT_DIR"
2017-09-14 01:51:02 +00:00
Tao Bao
e45026effa
Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b
...
am: 4a5a1e15a1
2017-09-14 00:43:53 +00:00
Tao Bao
4a5a1e15a1
Merge "Consider prebuilt vendor.img as having vendor partition."
...
am: 8a7b0dee6b
2017-09-14 00:25:48 +00:00
Adam Seaton
ac9cd77574
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f
...
am: eada8fa3e3
2017-09-13 22:50:43 +00:00
Adam Seaton
b1579af4fb
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
...
am: 54f1f70971
2017-09-13 22:49:34 +00:00
Adam Seaton
eada8fa3e3
[Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours
...
am: e9263f666f
2017-09-13 22:25:08 +00:00
Adam Seaton
54f1f70971
[Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours
...
am: 26bba7b920
2017-09-13 22:24:25 +00:00
