Commit Graph

39141 Commits

Author SHA1 Message Date
Nan Zhang
d43952b8f8 Merge "Move private_manifest file insertion to jars merging phase."
am: 3d6aaa2f56

Change-Id: Idfa204e931e69b86e7f9845887edfa3b2abdf0d8
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
db347c5cb4 Merge "Make soong_java_prebuilt.mk accept dex jars"
am: d739bef96d

Change-Id: Ie9909adf61560f82d9a7c7482c2769fe4d81baee
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
524ede46bb Merge "Replace DX_ALT_JAR with USE_D8"
am: 3b236ad3e3

Change-Id: I193a3d98cbbdc3f7bb88fb588c9ef9fba8b837c4
2017-09-20 20:01:42 +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

Change-Id: Iad7343ad4d2889fc39161e8ab14449f42d23008b
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
279df08f3b Merge "Revert "Revert "Make privileged apps always keep uncompressed dex files."""
am: 121fe5a80a

Change-Id: I9e54a206dd3f565e9facc07b4a595f1cf550164b
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
878d03842f Merge "Fix sdk-addon build on build servers"
am: 70d8dbc125  -s ours

Change-Id: Id065e983dfcf908f7bbfd684d0bc4f7ec3e196f2
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
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
7a8ab7e279 Merge "Fix sdk-addon build on build servers" into stage-aosp-master 2017-09-19 19:16:13 +00:00
Colin Cross
a541eaa665 Merge "Revert "Upgrade to ManifestMerger2""
am: c165d9c9ba

Change-Id: I048de67c02b32f9179d245fd98636333c366bddf
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.

Bug: 36005379
Change-Id: If5516b34c103016529de4d591038e9e34260a8e8
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.

Change-Id: I6b029f2044385f3e3fa332091a9244cec79d2474
2017-09-19 13:09:27 +01:00
Colin Cross
8304b5732a Merge "Upgrade to ManifestMerger2"
am: 4971146b2b

Change-Id: I1be76ff452d131f1a4dbe0b12e3b1389fc46f935
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
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
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
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
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
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
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
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
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
4a5a1e15a1 Merge "Consider prebuilt vendor.img as having vendor partition."
am: 8a7b0dee6b

Change-Id: I24451a308365873432eafd3fdc30403a9514ef7e
2017-09-14 00:25:48 +00: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
Tao Bao
8a7b0dee6b Merge "Consider prebuilt vendor.img as having vendor partition." 2017-09-13 22:10:43 +00:00
Steve Muckle
634ab481da Merge "get kernel configs from kernel/configs"
am: b4a3124822

Change-Id: Ib6a306a7bf4725e4030893bdb24d2de394fb38be
2017-09-13 21:08:28 +00:00
Steve Muckle
b4a3124822 Merge "get kernel configs from kernel/configs" 2017-09-13 19:33:19 +00:00
Tao Bao
b22afea0f0 Consider prebuilt vendor.img as having vendor partition.
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.

For targets not using AVB, this change is no-op.

Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
      generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
2017-09-13 11:05:15 -07:00
Steve Muckle
378c2bb42a get kernel configs from kernel/configs
The kernel configs have moved out of VTS and into their own
repository.

Test: build and boot
Change-Id: I649af63216e7b18604586f70396bceff626c30d0
2017-09-12 16:26:28 -07:00
Steven Moreland
16d7c08dab Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd
2017-09-12 19:48:12 +00:00
Treehugger Robot
f38900dc92 Merge "aosp_arm64_ab is vndk" 2017-09-12 19:18:40 +00:00
Tianjie Xu
b34a5ce36e Merge "Add a verbose option to RunCommand in build_image.py"
am: ab61b6b895

Change-Id: I7ebc5a522a76134576ab3f7ed61e2f6916d179da
2017-09-11 20:04:00 +00:00