tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23224 commits 1 branch 0 tags 115 MiB
Commit graph

23224 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Inseob Kim
067da4911f [automerger skipped] Create only one vendor variant depending on path am: 85708802d4 am: b56865ee60 -s ours 
am skip reason: Change-Id I4ebe1da8d887cd76722fa8ab5ae9305da09074d4 with SHA-1 af578ffacc is in history

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

Change-Id: Ib26f30805d4e824e5be7b420e15aca8c4873788f
 2020-06-08 03:58:46 +00:00
Inseob Kim
d205a1c571 [automerger skipped] Implement cc_object vendor snapshot am: 1042d29705 am: d05c43a1ff -s ours 
am skip reason: Change-Id Idf4fd37a26f6f712f3cbab43133622f9f9bd9372 with SHA-1 502679e061 is in history

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

Change-Id: Icdd82d3ac01603eb60099a48ce18de5e443b5fe2
 2020-06-08 03:58:44 +00:00
Inseob Kim
fda5a6763e [automerger skipped] Refine logic choosing vendor snapshot modules am: 7f283f4bd0 am: 8aa5b39019 -s ours 
am skip reason: Change-Id Id90082b5ab730f928582ad24f022ba410855400e with SHA-1 4d8d8fec4a is in history

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

Change-Id: Ie6ab7d258618477cf6635cd2530b797d5ee11243
 2020-06-08 03:58:41 +00:00
Inseob Kim
ab24ae3b5b Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 am: 37ed5063e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324103

Change-Id: I616bc3532a3450327ccdd4e61ba95ad4ed53d80a
 2020-06-08 03:46:12 +00:00
Inseob Kim
b56865ee60 Create only one vendor variant depending on path am: 85708802d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324102

Change-Id: I5526061c26e2949b8894eafa5df85014de0a229d
 2020-06-08 03:46:10 +00:00
Inseob Kim
d05c43a1ff Implement cc_object vendor snapshot am: 1042d29705 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324101

Change-Id: Id4d0d381b9c06eb6f012411e9184d4b993852568
 2020-06-08 03:46:08 +00:00
Inseob Kim
8aa5b39019 Refine logic choosing vendor snapshot modules am: 7f283f4bd0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324100

Change-Id: Ic2926232e9ffff86146f2bdde8f589752eb01876
 2020-06-08 03:46:06 +00:00
Inseob Kim
37ed5063e2 Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 
* changes:
  Do not disable llndk libraries
  Create only one vendor variant depending on path
  Implement cc_object vendor snapshot
  Refine logic choosing vendor snapshot modules
 2020-06-08 03:34:24 +00:00
Treehugger Robot
1c63b712b2 Merge "Add eakammer and patricearruda to OWNERS" am: 575c610bba am: 4ba565ea17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324040

Change-Id: I7c341f835ca7a30bfebc5588353920917cd07ab1
 2020-06-05 23:57:16 +00:00
Treehugger Robot
4ba565ea17 Merge "Add eakammer and patricearruda to OWNERS" am: 575c610bba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324040

Change-Id: I6b3be9b0cdb1b6fe52765ec518cb7044fdfb4f91
 2020-06-05 23:43:38 +00:00
Treehugger Robot
575c610bba Merge "Add eakammer and patricearruda to OWNERS" 2020-06-05 23:30:31 +00:00
Alexander Smundak
98ccfcafbe Merge "Fix android_app_set documentation" am: 99e4fba932 am: 29faa37442 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324841

Change-Id: I3b6ca821204db84cf0624bf1de3c435424663cef
 2020-06-05 22:57:54 +00:00
Alexander Smundak
29faa37442 Merge "Fix android_app_set documentation" am: 99e4fba932 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324841

Change-Id: I35634c8ed1290b5848fb4a5a8278b65fbcbf0106
 2020-06-05 22:46:03 +00:00
Sasha Smundak
c4f0ff1d6c Cherrypick aosp/1318079 and aosp/1324841 
Allow apex module to have android_app_set as its constituent.
Fix android_app_set documentation

Fixes: 157166068
Test: treehugger & manual
Change-Id: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: Id9b296d9301902deb463b299413491bc66d58944
 2020-06-05 15:39:38 -07:00
Alexander Smundak
99e4fba932 Merge "Fix android_app_set documentation" 2020-06-05 22:31:32 +00:00
Colin Cross
b83929c944 Add eakammer and patricearruda to OWNERS 
Change-Id: I4209fc5149dcce6bf75aef130afc69c4600c7f3b
 2020-06-05 20:31:40 +00:00
Anton Hansson
382d063d80 [automerger skipped] Merge "Correct link type for module stubs" am: 4f3dc39a47 am: 0b25319e34 -s ours 
am skip reason: Change-Id I49b9082dc1b5afe6c22e94126e574dd8061f0f39 with SHA-1 0bd88d0b4e is in history

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

Change-Id: I5e43acd88d2a2b7fe15ec87ac0d34d3b3db88bf4
 2020-06-05 20:04:54 +00:00
Treehugger Robot
0132e19870 Merge "Pass the TMPDIR directly to the command when dumping makefile variables." am: 24fae40b8d am: 48fb89270f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324019

Change-Id: I3b9759d0375eb19be2ab907833c0bd6bf89168a9
 2020-06-05 20:04:19 +00:00
Anton Hansson
0b25319e34 Merge "Correct link type for module stubs" am: 4f3dc39a47 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324610

Change-Id: Icce2a751d991e21094721034cfa2f75a36040906
 2020-06-05 19:46:41 +00:00
Treehugger Robot
48fb89270f Merge "Pass the TMPDIR directly to the command when dumping makefile variables." am: 24fae40b8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324019

Change-Id: Id4daaa8a1542e82b118cb93789e074f4ca3d37dc
 2020-06-05 19:46:31 +00:00
Anton Hansson
4f3dc39a47 Merge "Correct link type for module stubs" 2020-06-05 19:32:33 +00:00
Treehugger Robot
24fae40b8d Merge "Pass the TMPDIR directly to the command when dumping makefile variables." 2020-06-05 19:32:30 +00:00
Anton Hansson
0cb1998f58 [automerger skipped] Merge "Improve the structure of the link check method" am: 14da93be48 am: 0f8187d4c1 -s ours 
am skip reason: Change-Id Ic337a073c3bd14ac03b1d899aeb612247a708495 with SHA-1 ac103461a4 is in history

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

Change-Id: I625d0207a8e8aa0bb4b633c11ddf0f37bb3935c1
 2020-06-05 19:09:55 +00:00
Anton Hansson
0f8187d4c1 Merge "Improve the structure of the link check method" am: 14da93be48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324609

Change-Id: I1b45c0ae2e7dcb8ef81c385a2b0a9aacd3c7ed1a
 2020-06-05 18:50:59 +00:00
Anton Hansson
14da93be48 Merge "Improve the structure of the link check method" 2020-06-05 18:36:58 +00:00
Anton Hansson
7a71e4e158 [automerger skipped] Merge "Build java_sdk_library stubs with language level 8" am: 79fe805e05 am: 56b248162b -s ours 
am skip reason: Change-Id I9439ed516dda68ef516ff08d1c6045de3d3c1c0e with SHA-1 cf4dd4c1df is in history

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

Change-Id: I44747bc0d46c4b37e7ad03470851d88a34c6c301
 2020-06-05 18:34:43 +00:00
Anton Hansson
56b248162b Merge "Build java_sdk_library stubs with language level 8" am: 79fe805e05 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324608

Change-Id: I6b00dc892f627e9b4da6f995609b1f6f6cf24f93
 2020-06-05 18:24:15 +00:00
Jaewoong Jung
5cc50a1ac9 [automerger skipped] Add apex_set module. am: 9c49b285f2 am: 60ff397cc8 -s ours am: 0011ebcd34 -s ours 
am skip reason: Change-Id I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7 with SHA-1 8cf307e754 is in history

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

Change-Id: I3016847b1a2f846bd51e54a477b9dc10824a24a9
 2020-06-05 18:10:00 +00:00
Sasha Smundak
13a8b72290 [automerger skipped] Implement android_app_set module am: 8539023170 am: 3ed701b6c5 -s ours am: f1fee4a692 -s ours 
am skip reason: Change-Id Id0877476f9ae23311d92c0b59a9c568140ab4119 with SHA-1 4de27a5757 is in history

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

Change-Id: Iea12bd9741fd755b33077b23fe6ad65426e997ff
 2020-06-05 18:09:51 +00:00
Sasha Smundak
6665b9f52b [automerger skipped] Implement extract_apks am: 97d511a16d am: f5eec5c80c -s ours am: 691c817e3a -s ours 
am skip reason: Change-Id Ia15d66e86c7bcfd52f5b776173ca1665b68ff438 with SHA-1 bbf0579ac7 is in history

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

Change-Id: I2da7b64a6cf2c4416275a81183af8f65e9eb7370
 2020-06-05 18:09:48 +00:00