tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39910 commits 1 branch 0 tags 119 MiB
Commit graph

39910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Miao Wang
1d6d78ef38 Merge "Correctly set the linker search path for libm and libc." am: b463cdc874 am: 6062710fed 
am: e277ce63f8

Change-Id: Ib34fe4f4f47f68cbdf0271c61f5102b35a4db9f0
 2017-09-23 00:48:05 +00: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
b42dcd1c37 Merge "Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""" am: cb1e04a11f am: cc5e24c1db 
am: 8e9b4c0506

Change-Id: I44d3996a370515c405153828743acf1176a0f06e
 2017-09-22 22:45:52 +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
621eeeae55 Merge "Remove ijar" am: 1dcffadbc7 am: dee143988e 
am: a3e8ffd536

Change-Id: I80497bc760a2e6571b4a837b02f5db9f42f932b7
 2017-09-22 21:34:34 +00: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
15e15a07f0 Merge "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"" am: 7d607a1917 am: 0b42833ae3 
am: 8cfde56105

Change-Id: I050e493b16ea38e011b6c7ec7142bad0c7ab1886
 2017-09-22 21:00: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
Mathieu Chartier
4d50046824 Merge "Add support for profiles without preopt" into oc-mr1-dev 
am: 1fbc7fe671

Change-Id: I33ee084317a18181ce3b43afe9da5a7ec3876d61
 2017-09-22 19:58:07 +00:00
Mathieu Chartier
1fbc7fe671 Merge "Add support for profiles without preopt" into oc-mr1-dev 2017-09-22 19:48:40 +00:00
Colin Cross
b462db9cbc Merge "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES" am: b6fc0a1cae am: 9761a1128b 
am: 6b261e5b22

Change-Id: I4972ac0ebfc54ebc7a66c56e2837d7f3d8934c8b
 2017-09-22 18:22:37 +00: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
d7551bd0fa Merge "Proguard implicitly generates a proguard_dictionary" am: 58e0b8c0a3 am: b1fe04371b 
am: f71eea848b

Change-Id: Ie9c91ed5f4dc94757bafb1c2ae97d63afe06fb35
 2017-09-22 08:33:28 +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
81008bec58 Merge "Re-org the merge_zips logiic under Turbine rule." am: c9501f7d60 am: 849dc6c9d8 
am: 4cc7071766

Change-Id: I5c63702223ea80d05931cbd2db82e0974ee7e3a6
 2017-09-22 06:04:20 +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
Jiyong Park
b77f08e791 DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for A/B devices 
am: 8f7bc0e6bd

Change-Id: I84dc8ca8cec580cc424f7458268fbc23a389ba8b
 2017-09-22 00:12:10 +00: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
Jiyong Park
8f7bc0e6bd DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for A/B devices 
TARGET_2ND_CPU_VARIANT for non A/B devices has been changed to
cortex-a15 for better performance. Do the same for A/B devices.

Bug: 65042524
Test: build with aosp_arm64_ab
Change-Id: Id67c2779d2170f29b278c1c8a9ac513aa76a620d
 2017-09-21 19:44:05 +09: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
7939e07653 Merge "Add missing copy back to soong_java_prebuilt.mk" am: bedc2110b7 am: 21276ed7c7 
am: 2de7197fd3

Change-Id: I634e72a376027b6bead7a6be35bebd58e218e88b
 2017-09-21 05:22:28 +00: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
c128894560 Merge "Move private_manifest file insertion to jars merging phase." am: 3d6aaa2f56 am: d43952b8f8 
am: abbb6a1fa1

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

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
43f1c57120 Merge "Make soong_java_prebuilt.mk accept dex jars" am: d739bef96d am: db347c5cb4 
am: 35b1a46bf0

Change-Id: If94e12488d4aa7b09ee347e97c7758e27c4a8011
 2017-09-20 23:06:30 +00: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