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

39266 Commits

Author SHA1 Message Date
Dan Willemsen a3e8ffd536 Merge "Remove ijar" am: 1dcffadbc7 
am: dee143988e

Change-Id: Id3842e13f262c549deaa25101c38f60fb7e03614
 2017-09-22 21:31:55 +00:00
Dan Willemsen dee143988e Merge "Remove ijar" 
am: 1dcffadbc7

Change-Id: I55b0892905cf67655661f5a15ef3574e9e27db97
 2017-09-22 21:30:17 +00:00
Dan Willemsen 1dcffadbc7 Merge "Remove ijar" 2017-09-22 21:23:13 +00:00
Colin Cross 8cfde56105 Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: 7d607a1917 
am: 0b42833ae3

Change-Id: I9a535f635da245473130345643e1e0b0250885df
 2017-09-22 20:56:41 +00:00
Colin Cross 0b42833ae3 Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" 
am: 7d607a1917

Change-Id: Iad553437753e78131e34da89bb61a2b75ac4f796
 2017-09-22 20:53:44 +00:00
Colin Cross 7d607a1917 Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" 2017-09-22 20:37:14 +00:00
Colin Cross 15a2fa21a8 Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES" 
This reverts commit 4a93294fc1.

Broke builds with absolute OUT_DIR.

Test: revert
 2017-09-22 13:33:52 -07:00
Colin Cross 6b261e5b22 Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES" am: b6fc0a1cae 
am: 9761a1128b

Change-Id: I3c8e924e02912928dac1747fe980993fac2efbf6
 2017-09-22 18:18:03 +00:00
Colin Cross 9761a1128b Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES" 
am: b6fc0a1cae

Change-Id: I4e082de7606caafb56cd7e9fff51fa571073e635
 2017-09-22 18:11:03 +00:00
Colin Cross b6fc0a1cae Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES" 2017-09-22 17:55:35 +00:00
Richard Uhler f71eea848b Merge "Proguard implicitly generates a proguard_dictionary" am: 58e0b8c0a3 
am: b1fe04371b

Change-Id: Id92f7f80843ef213a50a21f169c319748296ce12
 2017-09-22 08:31:29 +00:00
Richard Uhler b1fe04371b Merge "Proguard implicitly generates a proguard_dictionary" 
am: 58e0b8c0a3

Change-Id: If925fd78c504c8e971a27c9c7e33f77c954b47cf
 2017-09-22 08:29:28 +00:00
Richard Uhler 58e0b8c0a3 Merge "Proguard implicitly generates a proguard_dictionary" 2017-09-22 08:23:52 +00:00
Nan Zhang 4cc7071766 Merge "Re-org the merge_zips logiic under Turbine rule." am: c9501f7d60 
am: 849dc6c9d8

Change-Id: Icb9b4561585eb01a69207af3004644d46bfb922c
 2017-09-22 06:01:50 +00:00
Nan Zhang 849dc6c9d8 Merge "Re-org the merge_zips logiic under Turbine rule." 
am: c9501f7d60

Change-Id: Ibfc1bbb6f0b9205b43d5676e0dcba9a72f81dc70
 2017-09-22 05:59:19 +00:00
Treehugger Robot c9501f7d60 Merge "Re-org the merge_zips logiic under Turbine rule." 2017-09-22 05:54:58 +00:00
Colin Cross 4a93294fc1 Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES 
Support the same syntax as LOCAL_TEST_DATA for
LOCAL_JAVA_RESOURCE_FILES to allow placing files at a subdirectory
in the jar file by replacing the / before the first path element
to be included with a :.

Test: m -j checkbuild
Test: out/build-${TARGET_PRODUCT}.ninja is the same
Change-Id: I83f3d45bdd156200308dc7ed0e0fea5d895d37a6
 2017-09-21 20:45:55 -07:00
Nan Zhang fda45fdbe1 Re-org the merge_zips logiic under Turbine rule. 
Mac java build has flaky error for merge_zips. The error happend is
because both turbine.jar.premerged and static_java_libs are missing.

We allow one of them can be missing, but we don't allow both of them are
missing. So re-org the merge_zips logic to see if the input of Turbine is
empty or it is due to Turbine internal.

Bug: b/66441248
Test: m clean && m -j32
Change-Id: I3c4b15004fd67fef2b83eabc36841bc8c8ff6e4c
 2017-09-21 16:51:18 -07:00
Dan Willemsen 6f2284e4fe Remove ijar 
It's no longer used.

Test: cs/
Change-Id: Ib24094e494d4caa390f83df28c179b6012691ebc
 2017-09-21 16:08:51 -07:00
Richard Uhler b32775a9b5 Proguard implicitly generates a proguard_dictionary 
Use .KATI_IMPLICIT_OUTPUTS to convey as such.

This is to support a use case for building platform/art/tools/ahat,
which depends on the generated proguard_dictionary for running tests.

Test: m
Test: m ahat-test with relevant changes from clean build.
Change-Id: Ic8f3b6819cfd4cd18620a2eaafd80d672fde8f5c
 2017-09-21 10:53:09 +01:00
Colin Cross 2de7197fd3 Merge "Add missing copy back to soong_java_prebuilt.mk" am: bedc2110b7 
am: 21276ed7c7

Change-Id: Ibc3c855665d6b48da76d7a28d3ee80f46e2f257f
 2017-09-21 05:19:26 +00:00
Colin Cross 21276ed7c7 Merge "Add missing copy back to soong_java_prebuilt.mk" 
am: bedc2110b7

Change-Id: I5e0f7ae8aba716c15a02d62d1f8c74e375ce240f
 2017-09-21 05:17:07 +00:00
Treehugger Robot bedc2110b7 Merge "Add missing copy back to soong_java_prebuilt.mk" 2017-09-21 05:10:52 +00:00
Nan Zhang abbb6a1fa1 Merge "Move private_manifest file insertion to jars merging phase." am: 3d6aaa2f56 
am: d43952b8f8

Change-Id: I79d1548bbaa763e3756bbf1487fa187c821ea925
 2017-09-21 03:24:18 +00:00
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 dcd6b243ac Add missing copy back to soong_java_prebuilt.mk 
javalib.jar needs to be copied to both $(intermediates.COMMON)
and $(intermediates).

Test: m -j checkbuild
Change-Id: Ic2944691dced35c1e74d12f9948904cf748fe402
 2017-09-20 18:07:41 -07:00
Colin Cross 35b1a46bf0 Merge "Make soong_java_prebuilt.mk accept dex jars" am: d739bef96d 
am: db347c5cb4

Change-Id: Ie479d9ad52704319325a7e81f9ac67e582e13fda
 2017-09-20 23:02:00 +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 a2243f1ef8 Merge "Replace DX_ALT_JAR with USE_D8" am: 3b236ad3e3 
am: 524ede46bb

Change-Id: Ie211cb1d7d60866551fe159f36b29a9a2d381329
 2017-09-20 20:07:06 +00: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
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