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
Colin Cross c70fcc848c Add dependencies on bootclasspath libraries am: 1d1e5ef61b 
am: fa4d9fbfdd

Change-Id: I37e3ee3e16c9616a4a43123b8a34ac203d87fbfa
 2017-09-26 01:22:53 +00:00
Colin Cross 3bdb80d27f Reindent bootclasspath code am: f6bc1a1ac0 
am: e0f8317395

Change-Id: I4752fb23d30e6018a9840e01c4caf4f745dc9afc
 2017-09-26 01:22:45 +00:00
Colin Cross fa4d9fbfdd Add dependencies on bootclasspath libraries 
am: 1d1e5ef61b

Change-Id: Ied184dcd38338e6a7941a36dcc1fb4dce6f5f286
 2017-09-26 01:18:30 +00:00
Colin Cross e0f8317395 Reindent bootclasspath code 
am: f6bc1a1ac0

Change-Id: I629bc0508e7d60248d4af9aef15352692e04c2cf
 2017-09-26 01:18:20 +00:00
Colin Cross 1d1e5ef61b Add dependencies on bootclasspath libraries 
The libraries in the bootclasspath were getting their dependencies
because they were also in the default libraries list.  Make the
dependencies explicit in preparation for rearranging the default
libraries.

Test: m -j checkbuild
Change-Id: I3ea004714a31cd648ec2ef57ed3099bce70bc6b9
 2017-09-25 16:14:42 -07:00
Dan Willemsen 9fb36911a6 Merge "Fix mips emulator boot" am: 557eae2175 
am: fea7b1efb1

Change-Id: I4fdb0c8c8a54135cd057161314eee56a21c58e08
 2017-09-25 22:35:48 +00:00
Dan Willemsen fea7b1efb1 Merge "Fix mips emulator boot" 
am: 557eae2175

Change-Id: I8207e6e48ea8867ed77f534e886aeb7f9c5419db
 2017-09-25 22:32:08 +00:00
Dan Willemsen 557eae2175 Merge "Fix mips emulator boot" 2017-09-25 22:18:52 +00:00
Colin Cross f6bc1a1ac0 Reindent bootclasspath code 
Apply indentation to the bootclasspath selection code.

Test: m -j checkbuild
Change-Id: I5ca15636d34d43f9ebe7264d566d06d8c045b0e3
 2017-09-23 19:48:27 -07:00
Miao Wang e277ce63f8 Merge "Correctly set the linker search path for libm and libc." am: b463cdc874 
am: 6062710fed

Change-Id: I89d76280605b0b28e1a8421eb8a2cd35085cf159
 2017-09-23 00:46:06 +00:00
Miao Wang 6062710fed Merge "Correctly set the linker search path for libm and libc." 
am: b463cdc874

Change-Id: I07df49db9881ee4e37b56f771d7a523680e06c04
 2017-09-23 00:44:04 +00:00
Treehugger Robot b463cdc874 Merge "Correctly set the linker search path for libm and libc." 2017-09-23 00:34:21 +00:00
Colin Cross 8e9b4c0506 Merge "Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""" am: cb1e04a11f 
am: cc5e24c1db

Change-Id: I8137fce4fc12033182b290b0f9c7aa1c6f90af75
 2017-09-22 22:43:50 +00:00
Colin Cross cc5e24c1db Merge "Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""" 
am: cb1e04a11f

Change-Id: I4380ad5ba81879334bf505136acef2fc86a11b48
 2017-09-22 22:41:26 +00:00
Colin Cross cb1e04a11f Merge "Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""" 2017-09-22 22:36:43 +00:00
Miao Wang 28e78f4600 Correctly set the linker search path for libm and libc. 
- ndk/r10 is removed, we need to use SOONG ndk stubs instead.
  - Use MIN_SUPPORTED_SDK_VERSION instead of hard coded version 9 for
    32 bit compilation.

Bug: 38342163
Test: mm
Test: make -j40 FORCE_BUILD_RS_COMPAT=true RSTest_Compat
Change-Id: I9549446cb7f8faee8842b06f096d035535dc7f3d
 2017-09-22 14:57:02 -07:00
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 34a9885f34 Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" 
This reverts commit 15a2fa21a8.

This reapplies I83f3d45bdd156200308dc7ed0e0fea5d895d37a6 without
the error on absolute paths if they are in $(OUT_DIR).

Test: OUT_DIR=/tmp/out mmma -j art/tools/ahat
Change-Id: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
 2017-09-22 13:45:23 -07: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