openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
39,284 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

39284 Commits

Author SHA1 Message Date
Nan Zhang 177e7ffb20 Merge "Use merge_zips to merge jars during Java build in Make." am: 39bbfe217a 
am: d9001d2733

Change-Id: I7f04e255cd8cb6fa0f614d504e80de42b323dd8c
 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

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

Change-Id: I125b3968e5a38341c4e2fa6a58163072b9c233cd
 2017-09-20 08:55:03 +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 e39d134881 Merge "Fix sdk-addon build on build servers" am: 70d8dbc125 -s ours 
am: 878d03842f

Change-Id: I2f5aafafac4728892c50ed7fb69ad90bb9ba5279
 2017-09-19 21:59:24 +00: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 1a024dbb89 Merge "Fix sdk-addon build on build servers" into stage-aosp-master 
am: 7a8ab7e279

Change-Id: I77aad5d46c343f6cc734c99a75c518ac6726c07a
 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

Change-Id: I9395173f7db8a0a4cef8a8c2aefd8d87aac1035d
 2017-09-19 15:50:25 +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 26eba4fb80 Merge "Upgrade to ManifestMerger2" am: 4971146b2b 
am: 8304b5732a

Change-Id: Ifa32f975d24d5ce5d11f227f8b69419113cec035
 2017-09-19 06:52:18 +00: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 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
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 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 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
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
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  -s ours

Change-Id: I2a05af22b869d37ae21f2da75adc21f742f2c1ee
 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

Change-Id: Iac5021d897f0c9f83886426663cd1428ca4a9c54
 2017-09-14 00:43:53 +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
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

Change-Id: I53a464d31d2956302a72e4c8aa1d8be48ce00ccd
 2017-09-13 22:50:43 +00:00