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

74014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
c4fa542b36 Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef am: c2c6d39f72 am: 0453c9526c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496

Change-Id: I3cc2446a172be708fa6348927ee2a8fe0633874d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:19:00 +00:00
Treehugger Robot
e37873e835 Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f am: 1f02fc33a2 am: 742a8bbddd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266

Change-Id: I7f8b9dfc7996a73990307fa0fc9cab88f3a2d3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:18:49 +00:00
Colin Cross
7c33abadd2 Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main am: ff4d5b40ca am: 57a30b28df am: b8e6f5facc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771124

Change-Id: Ifce1c2fe1caedd04f938c64ed2e118bb079dbc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:18:06 +00:00
Treehugger Robot
0453c9526c Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef am: c2c6d39f72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496

Change-Id: I5d0fda68c6ad33e70e6b26c8fa0b36e6607c08c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:48:14 +00:00
Treehugger Robot
742a8bbddd Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f am: 1f02fc33a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266

Change-Id: Ic71072da968635e554f6c3713fe3f9316aa44285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:48:06 +00:00
Colin Cross
b8e6f5facc Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main am: ff4d5b40ca am: 57a30b28df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771124

Change-Id: Id66cf313a4fc9beb35308443dfd1e1eba4522218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:47:58 +00:00
Treehugger Robot
c2c6d39f72 Merge "Don't create withres-withoutdex files for R8" into main am: 31a5b2c1ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768496

Change-Id: Ic3d9e6756d6ac8cbf7580bac1b6125fea2b4b84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:46:21 +00:00
Treehugger Robot
31a5b2c1ef Merge "Don't create withres-withoutdex files for R8" into main 2023-10-04 17:32:52 +00:00
Anton Hansson
1932d3a09e Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e am: dc99bafb1d am: 88cf24b098 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: I06b887adf6d0c289050a5f5fb867d029f34f1d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:30:06 +00:00
Treehugger Robot
1f02fc33a2 Merge "Remove unnecessary flag for Kotlin compiles" into main am: c68afc4e9f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769266

Change-Id: I2aacf5397e71d94a56841341524e97d535e6667b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:14:42 +00:00
Treehugger Robot
c68afc4e9f Merge "Remove unnecessary flag for Kotlin compiles" into main 2023-10-04 17:07:22 +00:00
Colin Cross
57a30b28df Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main am: ff4d5b40ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771124

Change-Id: I9728cca90fca6477f7f8a5be3a083a44ab7b539f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:00:50 +00:00
Anton Hansson
88cf24b098 Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e am: dc99bafb1d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: Icaa3a09d152ae1e840df31401107b24a3686b0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 16:43:54 +00:00
Colin Cross
ff4d5b40ca Merge "Don't pass -lrt or -lgcc_s to darwin rust compiles" into main 2023-10-04 16:36:03 +00:00
Anton Hansson
dc99bafb1d Merge "Support passing lint baseline to doclava" into main am: ddbfdb7f7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769206

Change-Id: I93f042dbda1980e5eb3a8d9e097fa688b7c9cc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 16:13:39 +00:00
Anton Hansson
ddbfdb7f7e Merge "Support passing lint baseline to doclava" into main 2023-10-04 15:53:49 +00:00
Liz Kammer
e10fef75f1 Remove unnecessary flag for Kotlin compiles 
This has been fixed in upstream Kotlin

Test: add /tmp/build.txt file and m metalava
Change-Id: I6d088548ee5a31452ad637bbdd75e26c8863926d
 2023-10-04 10:37:05 -04:00
Justin Yun
3b5053ee1f Merge "Generate product variants by default" into main am: ce12ea8f95 am: dead374d4d am: 955b380660 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: Ic57076b4aa01f74a3f653d04fd6da681e3e9d36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 08:08:22 +00:00
Justin Yun
955b380660 Merge "Generate product variants by default" into main am: ce12ea8f95 am: dead374d4d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: I8f478269f6b2b087ad0afcf26ac091f766253d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:37:43 +00:00
Justin Yun
dead374d4d Merge "Generate product variants by default" into main am: ce12ea8f95 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: I31046c62e08a60dbc460f3ac8393782d868d630d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:07:47 +00:00
Justin Yun
ce12ea8f95 Merge "Generate product variants by default" into main 2023-10-04 06:29:31 +00:00
Colin Cross
e18bd2097b Don't pass -lrt or -lgcc_s to darwin rust compiles 
Fix mac builds by removing the -lrt and -lgcc_s flags from darwin
rust compiles.

Bug: 293349612
Test: builds
Change-Id: I99a9fea963761730efc4d3236135ee6d83dbca57
 2023-10-03 21:45:33 -07:00
Treehugger Robot
b8246fbafe Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c am: 31f5c0d738 am: 632e6360d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I7f65e5206789ef40fd749229301fcf4effd00f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 01:27:42 +00:00
Treehugger Robot
b6508f3433 Merge "Revert "Split Rust crate builds into compile and link phases."" into main am: 2d1bf53169 am: 3afb5d8c7b am: e883f2fdbe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768553

Change-Id: Ie80d9654722806381beecf74fb6a3439f410fb7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 01:26:09 +00:00
Treehugger Robot
632e6360d1 Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c am: 31f5c0d738 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I0aa8febae1fcff7f6c598e5574f27fd55a2f0d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:55:11 +00:00
Treehugger Robot
e883f2fdbe Merge "Revert "Split Rust crate builds into compile and link phases."" into main am: 2d1bf53169 am: 3afb5d8c7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768553

Change-Id: Ifc46e736d0624e5605dd247f57035f7bde468847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:54:57 +00:00
Treehugger Robot
31f5c0d738 Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

Change-Id: I80f97088df6104a3e69846ffcf995c24b71bb1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:25:38 +00:00
Treehugger Robot
3afb5d8c7b Merge "Revert "Split Rust crate builds into compile and link phases."" into main am: 2d1bf53169 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768553

Change-Id: I978411fe3639ad3684cb9d5941fd38369a2ac764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:24:55 +00:00
Treehugger Robot
4cbd49810c Merge changes Ib2667798,I9a1fa32b into main 
* changes:
  Symlink to rules_testing in soong integration test.
  Remove AconfigJavaHostTest from the allowlist.
 2023-10-04 00:22:57 +00:00
Treehugger Robot
2d1bf53169 Merge "Revert "Split Rust crate builds into compile and link phases."" into main 2023-10-04 00:01:08 +00:00
Yu Liu
d61dcef2ff Symlink to rules_testing in soong integration test. 
Bug: None
Test: CI
Change-Id: Ib2667798ba4ae330ff46978b37c9c50a5a0cd477
 2023-10-03 14:49:50 -07:00
Treehugger Robot
5836515d26 Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f am: e77d2e4197 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: Iab4b4ef4c4a7f6d54cb46b9d9858d846891a715d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:55:02 +00:00
Treehugger Robot
e77d2e4197 Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: I592565fda708934caf3089671311abd209fe951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:24:23 +00:00
Mark Dacek
50929ce3f4 Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8 am: 4ea798d3fd am: 03785bb591 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443

Change-Id: Ifea57e95e0d1519d39aa10a3c6228ecb8facc690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:09:14 +00:00
Treehugger Robot
4003606c5f Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: I138e00eec2622acd40b8329fe1d04b9c31c9b6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:52:57 +00:00
Mark Dacek
03785bb591 Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8 am: 4ea798d3fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443

Change-Id: I9f67aa06053578bf65dbb9ff5e04c450685b98a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:36:25 +00:00
Treehugger Robot
72928074f5 Merge "Don't delete withres-withoutdex jar from R8 rules" into main 2023-10-03 19:17:56 +00:00
Mark Dacek
4ea798d3fd Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443

Change-Id: If1c67dc37b57f3dd11d7805ec2a55e8ebcdb9769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:04:56 +00:00
Jihoon Kang
f9503e962b Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 am: 40386ed37e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: Id25fb530531f6e535119651f1dc9facb17cfc23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:04:43 +00:00
Spandan Das
e8cabc1be1 Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d am: 063030cbb7 am: f26423b0fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118

Change-Id: Iab4f798f7d33cbd345d2296fcb662f1dd7161a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:04:32 +00:00
Yu Liu
f1212c4b0c Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 am: 2d7db62bcc am: 60ee7d23cd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I5e99f4ac89d79bf70f8a203d92759a28028e0b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:04:20 +00:00
Mark Dacek
4ac292ffd8 Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main 2023-10-03 18:39:46 +00:00
Jihoon Kang
40386ed37e Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: I330c0434af550bc6355342c7c27c20de47080a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:50 +00:00
Spandan Das
f26423b0fe Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d am: 063030cbb7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118

Change-Id: I1ceeefcf41300250195366cb2bf01e2098161bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:40 +00:00
Yu Liu
60ee7d23cd Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 am: 2d7db62bcc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I8b7b53149dc04abde9dcdaf468c0227a0384bc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:28 +00:00
Colin Cross
8484082fad Don't create withres-withoutdex files for R8 
The withres-withoutdex files were added in b/195558228 because D8
produced errors when given an input jar that contained both class
and dex files:
Error: com.android.tools.r8.internal.Cc: Cannot create android app from an archive 'out/soong/.intermediates/libcore/libcore-crypto-tests/android_common/withres/libcore-crypto-tests.jar' containing both DEX and Java-bytecode content

It turns out R8 doesn't have this problem, it defaults to ignoring *.dex
files unless the com.android.tools.r8.allowDexInputToR8 system property
is set.  Remove the withres-withoutdex files when using R8, but keep
it in place for D8 for now.

Bug: 302573555
Bug: 303264288
Bug: 303064127
Test: m checkbuild
Test: m Calendar && m Calendar
Test: m framework-minus-apex && m framework-minus-apex
Change-Id: Ib6410f7fef6faf5913476c6423cdd27215c68c45
 2023-10-03 18:27:28 +00:00
Yu Liu
b57dd3946e Remove AconfigJavaHostTest from the allowlist. 
It was added by an accident previously.

Bug: None
Test: CI
Change-Id: I9a1fa32bb2686f336f9735a1e809a8491d38cd4c
 2023-10-03 11:22:07 -07:00
Zi Wang
1772066f60 Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58 am: 8cae29f34c am: 066f962bb6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: I343ad02f6a6785eb9b723bd6b076943f3556bd10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:16:00 +00:00
Jihoon Kang
3d1cecda28 Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

Change-Id: Id1645b93c56654857c6d8ae551227c728ac76e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:02:14 +00:00
Spandan Das
063030cbb7 Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118

Change-Id: Id479359b55f4b75b92817cdeb3a5aaa4333c9c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:01:43 +00:00