Nan Zhang
c128894560
Merge "Move private_manifest file insertion to jars merging phase." am: 3d6aaa2f56 am: d43952b8f8
...
am: abbb6a1fa1
2017-09-21 03:26:18 +00:00
Nan Zhang
abbb6a1fa1
Merge "Move private_manifest file insertion to jars merging phase." am: 3d6aaa2f56
...
am: d43952b8f8
2017-09-21 03:24:18 +00:00
Nan Zhang
d43952b8f8
Merge "Move private_manifest file insertion to jars merging phase."
...
am: 3d6aaa2f56
2017-09-21 03:22:18 +00:00
Treehugger Robot
3d6aaa2f56
Merge "Move private_manifest file insertion to jars merging phase."
2017-09-21 03:16:34 +00:00
Colin Cross
43f1c57120
Merge "Make soong_java_prebuilt.mk accept dex jars" am: d739bef96d am: db347c5cb4
...
am: 35b1a46bf0
2017-09-20 23:06:30 +00:00
Colin Cross
35b1a46bf0
Merge "Make soong_java_prebuilt.mk accept dex jars" am: d739bef96d
...
am: db347c5cb4
2017-09-20 23:02:00 +00:00
Colin Cross
db347c5cb4
Merge "Make soong_java_prebuilt.mk accept dex jars"
...
am: d739bef96d
2017-09-20 22:57:31 +00:00
Colin Cross
d739bef96d
Merge "Make soong_java_prebuilt.mk accept dex jars"
2017-09-20 22:54:16 +00:00
Nan Zhang
b88011768d
Move private_manifest file insertion to jars merging phase.
...
By doing this, the change of private_manifest file won't trigger
Javac to re-run during re-build.
Bug: b/65455145
Test: m clean && m -j32
Change-Id: Ib90d56daf0be5f31b51e07b7714a933bc5cf4496
2017-09-20 14:56:48 -07:00
Alan Leung
befd06d051
Merge "Replace DX_ALT_JAR with USE_D8" am: 3b236ad3e3 am: 524ede46bb
...
am: a2243f1ef8
2017-09-20 20:11:06 +00:00
Alan Leung
a2243f1ef8
Merge "Replace DX_ALT_JAR with USE_D8" am: 3b236ad3e3
...
am: 524ede46bb
2017-09-20 20:07:06 +00:00
Alan Leung
524ede46bb
Merge "Replace DX_ALT_JAR with USE_D8"
...
am: 3b236ad3e3
2017-09-20 20:01:42 +00:00
Nan Zhang
6cdb1f8bc7
Merge "Use merge_zips to merge jars during Java build in Make." am: 39bbfe217a am: d9001d2733
...
am: 177e7ffb20
2017-09-20 20:00:46 +00:00
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
Treehugger Robot
3b236ad3e3
Merge "Replace DX_ALT_JAR with USE_D8"
2017-09-20 19:56:38 +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
95032843ba
Merge "Revert "Revert "Make privileged apps always keep uncompressed dex files.""" am: 121fe5a80a am: 279df08f3b
...
am: 3c36897dbc
2017-09-20 08:59:35 +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
Colin Cross
aadc3be5ca
Make soong_java_prebuilt.mk accept dex jars
...
Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar.
Test: m -j checkbuild
Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-19 13:02:17 -07: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
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
Jeff Gaston
07d179fdac
Merge "Fix sdk-addon build on build servers" into oc-mr1-dev-plus-aosp
2017-09-19 02:06:44 +00:00
Mathieu Chartier
cd32d9aea1
Merge "Add product property for preopting extracted APKs" into oc-mr1-dev
...
am: 9e2fd26a29
2017-09-18 22:55:46 +00:00
Jeff Gaston
2fa3fe1146
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 21:54:24 +00: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
710a41358a
Upgrade to ManifestMerger2
...
Switch to using ManifestMerger2 from
prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar
Bug: 36005379
Test: m -j checkbuild
Change-Id: I83bd3f95778e93796d06f063aa7c61d2a63b117b
Merged-In: I83bd3f95778e93796d06f063aa7c61d2a63b117b
(cherry picked from commit e76e8021eb
2017-09-18 21:03:23 +00:00
Colin Cross
1fe8e3c66d
Merge "Move jacocoagent into the bootclasspath" am: 68dad73d34 am: a6af8ef91f
...
am: e9a7688567
2017-09-18 20:32:10 +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
Mathieu Chartier
0fbb836cf6
Add product property for preopting extracted APKs
...
The property is PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK. If specified,
this preopts the APK with the default compile filter (quicken).
This will be used to quicken preopt of gmscore dynamite modules when
preopting is disabled. This fixes a possible RAM regression caused
by running out of the APK.
Bug: 65601274
Test: make and flash
Change-Id: Ibf0fa73ee7fafd9735e587baf19c4950a7da817a
2017-09-18 12:43:49 -07:00
Alan Leung
be7b6ed397
Replace DX_ALT_JAR with USE_D8
...
Which would invoke the d8 script instead of calling javac on the jar.
BUG: 65212022
Test: m USE_D8=true
Change-Id: I8ee0b14210cb40895b0b208a01606e10a41f0acf
2017-09-18 12:39:52 -07:00
Nicolas Geoffray
ad97c9d963
Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04 am: ed7dab7625
...
am: 7c1b5d08d4
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
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
