StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,001 Commits 1 Branch 0 Tags
f48d50bfb7373dfbb47d5a8d6fc6fdb8d24a5851
Commit Graph

23001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
f48d50bfb7 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 am: 274a80c492 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I8862a464aa374922dadedd68e47d1705b8ce5836
 2020-06-10 18:36:54 +00:00
Elliott Hughes
274a80c492 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I70fbe62a9da538ba484e78c5d9ea4ddbbe416737
 2020-06-10 18:25:42 +00:00
Elliott Hughes
a82ad479a4 Merge "Remove TARGET_PREFER_32_BIT support." 2020-06-10 18:07:06 +00:00
Paul Duffin
01c577968a Merge "java_sdk_library: Add system-server scope" into rvc-dev am: 4754d4451c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11705588

Change-Id: I6c2a7000cf7b46dcef8ed476d6e96ffc7e441ed4
 2020-06-10 13:12:51 +00:00
Paul Duffin
4754d4451c Merge "java_sdk_library: Add system-server scope" into rvc-dev 2020-06-10 13:01:31 +00:00
Victor Khimenko
690ccb2a4f [automerger skipped] Make it possible to specify separate rules for native_bridge case am: 78f654c6cf -s ours 
am skip reason: Change-Id I60145bbb9c94318f14af3cabd9f5960fc9ee62de with SHA-1 c26fcf4947 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11814300

Change-Id: If6f906185c5f349356aeb3831f87b43398a3ab46
 2020-06-10 00:05:44 +00:00
Jiyong Park
46b4ebb187 [automerger skipped] Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68 am: ebccc4ddf5 -s ours 
am skip reason: Change-Id I85570506e700be59ee63e4f1d7902a40e36df39c with SHA-1 afd3d11a79 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325676

Change-Id: Ib4b9675a095767ad2b117f644b9b8260defc8b0f
 2020-06-09 23:39:20 +00:00
Jiyong Park
ebccc4ddf5 Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325676

Change-Id: I1c70a39543d6edfef383464ae70e2d19518179b2
 2020-06-09 23:21:45 +00:00
Jiyong Park
d4873a6b68 Merge "dex_import that isn't available for platform isn't installed" 2020-06-09 23:02:10 +00:00
Victor Khimenko
78f654c6cf Make it possible to specify separate rules for native_bridge case 
This change make it possible to specify separate rules for native-bridge
case and non-native-bridge case.

Bug: http://b/153609531

Test: build 4arch product

Change-Id: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
Merged-In: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
 2020-06-09 23:35:37 +02:00
Victor Khimenko
a7ce2945bd Merge "Make it possible to specify separate rules for native_bridge case" am: bf488e10e8 am: b9b5662e3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1306133

Change-Id: I86837a0a58d6c7e55715da551b7fd0c5e54df19e
 2020-06-09 18:04:06 +00:00
Victor Khimenko
b9b5662e3f Merge "Make it possible to specify separate rules for native_bridge case" am: bf488e10e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1306133

Change-Id: I0657cc1bf2bea1165ff1615ab1db34aa6a9d83b6
 2020-06-09 17:52:37 +00:00
Victor Khimenko
bf488e10e8 Merge "Make it possible to specify separate rules for native_bridge case" 2020-06-09 17:41:28 +00:00
Ivan Lozano
c1e8528a00 Merge "Specify SONAME when building Rust shared libs." am: 4231e344fa am: 1d329be624 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326238

Change-Id: If9bfabe428428ce856769f4c4dfe5199ab29267d
 2020-06-09 16:38:01 +00:00
Pete Gillin
811814282d Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b am: 5dbf9e09f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I731da4ed59432a67bdc3df124a8939bcf316aa0c
 2020-06-09 16:37:21 +00:00
Ivan Lozano
1d329be624 Merge "Specify SONAME when building Rust shared libs." am: 4231e344fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326238

Change-Id: If4ad90a3e9fa781fe4daad3618a9d338b0aaf522
 2020-06-09 16:00:27 +00:00
Ivan Lozano
4231e344fa Merge "Specify SONAME when building Rust shared libs." 2020-06-09 15:49:34 +00:00
Pete Gillin
5dbf9e09f2 Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I93e8a2a91f9a5bed9d3274ad937bb351edf4aa88
 2020-06-09 13:28:54 +00:00
Pete Gillin
d7db79cc8b Merge "Split the core/platform API into stable and legacy versions." 2020-06-09 13:20:31 +00:00
Ramy Medhat
578c91fe13 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." am: 4e372f7841 am: 9ec9b60463 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323176

Change-Id: Icb4ad192227710eef30455409f7b0d99e2c128e1
 2020-06-09 12:46:56 +00:00
Ivan Lozano
bec05ea26d Specify SONAME when building Rust shared libs. 
Without specifying -soname, cc binaries are unable to locate Rust
provided shared libraries. This adds the -soname linker flag for shared
libraries.

Bug: 158490355
Test: readelf -d <cc_binary> shows the expected SONAME
Change-Id: I66852a7ce24d5ea5e426f11bc1834fb56a150628
 2020-06-09 08:40:24 -04:00
Ramy Medhat
9ec9b60463 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." am: 4e372f7841 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323176

Change-Id: I9549d3f9d482ea6b497fb5bb7d1cb0dcc878d46a
 2020-06-09 12:32:17 +00:00
Ramy Medhat
4e372f7841 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." 2020-06-09 12:17:38 +00:00
Victor Khimenko
c26fcf4947 Make it possible to specify separate rules for native_bridge case 
This change make it possible to specify separate rules for native-bridge
case and non-native-bridge case.

Bug: http://b/153609531

Test: build 4arch product

Change-Id: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
 2020-06-09 13:31:37 +02:00
Treehugger Robot
bf8b66d136 [automerger skipped] Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df am: 15a013b87a -s ours 
am skip reason: Change-Id I6175d7c59734ba9b6c32457e5a9b0704d49f4106 with SHA-1 92febdc85f is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I71301deba80c51da234ccad39d4d010030c0a04a
 2020-06-09 10:28:07 +00:00
Treehugger Robot
15a013b87a Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I45068a8fb9985d23da62da90b7d4304d71448664
 2020-06-09 10:11:38 +00:00
Treehugger Robot
8b1531e7df Merge "Revert^2: "Remove implict jni.h include path"" 2020-06-09 09:55:13 +00:00
Orion Hodson
5cffce1207 Revert^2: "Remove implict jni.h include path" 
Bug: 152482542
Test: m checkbuild

Change-Id: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Merged-In: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Exempt-From-Owner-Approval: approved in other branches
(cherry picked from commit e3ce0ba781)
 2020-06-09 09:54:56 +00:00
Elliott Hughes
79ae341d4b Remove TARGET_PREFER_32_BIT support. 
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: If96cccbd82ba1311165d61c947c928c6e7cd5593
 2020-06-08 16:37:13 -07:00
Frank Feng
afcf52820b Merge "Implement test config auto-gen for sh_test." am: d90c6c42e4 am: 58894c86dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323393

Change-Id: I2445722a4ac5f7ae6f3387261e35b5272ca951cb
 2020-06-08 21:31:52 +00:00
Frank Feng
58894c86dc Merge "Implement test config auto-gen for sh_test." am: d90c6c42e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323393

Change-Id: I666da5a4a5e09fb9deb14a8d4dad6be76583ed34
 2020-06-08 21:17:04 +00:00
Frank Feng
d90c6c42e4 Merge "Implement test config auto-gen for sh_test." 2020-06-08 21:05:31 +00:00
Alexander Smundak
b0a983ab13 [automerger skipped] Merge "Cherrypick aosp/1318079 and aosp/1324841" into rvc-dev am: feee554806 -s ours 
am skip reason: Change-Id I9f91f1b761286f489d175eb0772f78f702e8a2d6 with SHA-1 18d98bc3e0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11623069

Change-Id: Id837f31749fdd52cfe025edc4919675ceff6d12c
 2020-06-08 20:22:30 +00:00
Alexander Smundak
feee554806 Merge "Cherrypick aosp/1318079 and aosp/1324841" into rvc-dev 2020-06-08 20:09:10 +00:00
Nate Myren
30d1f9eb3b Revert "Use aapt2 flag --rename-resources-package in soong" 
Revert "Remove hardcoding of permission controller package"

Revert "Use permissionController name rather than hardcode"

Revert submission 11618534-rename-resources

Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround

Change-Id: I8d2aeff48cd2a3913b262f411c0613d5d61296af
 2020-06-08 19:35:01 +00:00
TreeHugger Robot
a4cf51ff72 Merge "Include car project in grey list removed apis" into rvc-dev am: 50cea1a76e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11746426

Change-Id: Ie39738a277df3af9bdae6c59ad39b4bf07b16287
 2020-06-08 18:13:03 +00:00
TreeHugger Robot
50cea1a76e Merge "Include car project in grey list removed apis" into rvc-dev 2020-06-08 18:07:38 +00:00
Paul Duffin
5a757b1ebb java_sdk_library: Add system-server scope 
Bug: 155164730
Test: m nothing
Change-Id: I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd
 2020-06-08 15:27:58 +01:00
Paul Duffin
2350cc7599 [automerger skipped] Merge "Copy removed.txt file to the snapshot correctly" into rvc-dev am: a109682456 -s ours 
am skip reason: Change-Id Iad34e91051da43222d22c240c16f50887c43d73e with SHA-1 3dbf9fd892 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11705587

Change-Id: Ifc7f9b98c6a2131996c88b9321efa7324532b77f
 2020-06-08 13:13:59 +00:00
Jiyong Park
3a3c871410 dex_import that isn't available for platform isn't installed am: afd3d11a79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11787985

Change-Id: I617bce4198e4e4b4dc6779246f0bfadcb6a442a4
 2020-06-08 13:13:27 +00:00
Paul Duffin
a109682456 Merge "Copy removed.txt file to the snapshot correctly" into rvc-dev 2020-06-08 13:03:14 +00:00
Jiyong Park
01bca755ae dex_import that isn't available for platform isn't installed 
This change fixes a bug that dex_import module is always installed to
the platform even when the module is not available to the platform.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 158284983
Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh
Merged-In: I85570506e700be59ee63e4f1d7902a40e36df39c
(cherry picked from commit afd3d11a79)
Change-Id: I85570506e700be59ee63e4f1d7902a40e36df39c
 2020-06-08 21:53:52 +09:00
Orion Hodson
92febdc85f Remove implict jni.h include path 
Bug: 152482542
Test: m checkbuild

Change-Id: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Merged-In: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
(cherry picked from commit e3ce0ba781)
Exempt-From-Owner-Approval: approved in other branches
 2020-06-08 12:40:25 +00:00
Jiyong Park
afd3d11a79 dex_import that isn't available for platform isn't installed 
This change fixes a bug that dex_import module is always installed to
the platform even when the module is not available to the platform.

Bug: 158284983
Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I85570506e700be59ee63e4f1d7902a40e36df39c
 2020-06-08 19:59:02 +09:00
Pete Gillin
1f41dbff64 Split the core/platform API into stable and legacy versions. 
For now, everything outside libcore still uses the legacy version.

Test: treehugger
Bug: 157640067
Change-Id: If5234e9ee533ff537926801a0af045d36b1caf01
 2020-06-08 10:53:51 +01:00
Treehugger Robot
76da210752 [automerger skipped] Merge "Use sdkSpec to compare sdk_versions of APK/JNI" am: 8a624337b3 am: d8b3df07ce -s ours 
am skip reason: Change-Id I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508 with SHA-1 9d2c0f7af2 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322146

Change-Id: I1e7b58c32e085537a77eb4d2d9fe674223965448
 2020-06-08 07:54:47 +00:00
Treehugger Robot
d8b3df07ce Merge "Use sdkSpec to compare sdk_versions of APK/JNI" am: 8a624337b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322146

Change-Id: Ieffbf61a1fb792e410e78c261662c80e15c2a05d
 2020-06-08 07:42:55 +00:00
Treehugger Robot
8a624337b3 Merge "Use sdkSpec to compare sdk_versions of APK/JNI" 2020-06-08 07:27:26 +00:00
Jooyung Han
652d5b31ef Use sdkSpec to compare sdk_versions of APK/JNI 
"current" is converted to int differently if we use
sdkSpec.effectiveVersion for APK and android.ApiStrToNum for JNI.
For example, in REL branch, "current" is equiv to PlatformSdkVersion
for APK, but 10000(FutureApiVersion) for JNI.

Use sdkSpec.effectiveVersion to compare APK.min_sdk_version and
JNI.sdk_version.

Exempt-From-Owner-Approval: cherrypick from internal

Bug: 145796956
Test: m
Merged-In: I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508
Change-Id: I2c4dbb79ae8712004dc3a9e647aa53cd5de7b508
(cherry picked from commit 9d2c0f7af2)
 2020-06-08 07:19:56 +00:00
Inseob Kim
67a2567d08 [automerger skipped] Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 am: 37ed5063e2 am: ab24ae3b5b -s ours 
am skip reason: Change-Id I059e639b21d0edb8abc00773891d37e890a36cce with SHA-1 470b4cf826 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324103

Change-Id: I61f9388f8d676262712e98b967d21f82a2a89b72
 2020-06-08 03:58:48 +00:00