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

72787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
e88fe1fb92 Merge "Expand regex for likely aidl filegroups" into main 2023-10-04 21:11:18 +00:00
Kousik Kumar
ca390b2f00 Update symlinks in output directory when TOP dir changes 
When TOP dir changes and we reuse the same output between the old and new checkouts, we need to rewrite all the symlinks used by Bazel and other tools in the out-directory to point to the new top directory. Otherwise, if the old source dir is deleted, the build will fail.

I used the OUT_DIR/soong/soong.environment.available file to find out the previous PWD.

Tested:
1. Create source dir 1, run build, create source dir 2, remote source dir 1, reuse out dir and rerun build => build succeeded with this change.
2. m libc after moving build TOP. Only the analysis phase was rerun, the actual build was not rerun.

Bug: b/300498226

Change-Id: I196625baa1f4efe7a4734accfa1f0be7c98a7920
 2023-10-04 21:07:36 +00:00
Alix
141ab6adde use message in android.AssertStringMatches() 
function does not currently use the message argument  passed to it.
outputting this as part of the error message would be helpful for any
failures.

Change-Id: I5307df1567e79d85f81edd5a9eb3d4a093041535
 2023-10-04 20:19:54 +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
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
Vinh Tran
50de8becd1 Export rust flags to bazel 
Bug: 290790800
Test: Inspect out/soong/soong_inspection folder after running `m bp2build`
Change-Id: Iffc43a540f67e5f07d109a0a87f3248fae035267
 2023-10-04 13:14:32 -04: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
1f309f3ac9 Allowlist AndroidFrameworkLintChecker 
Test: bp2build.sh
Bug: 299463632
Change-Id: I72def76df4f105a3496c7b2dd1588910e62d562b
 2023-10-04 10:37:05 -04: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
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
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
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
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
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
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
Yu Liu
2d7db62bcc Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429

Change-Id: I298633470fbb8c41442104419b811ac59751d213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:01:26 +00:00
Jihoon Kang
a7e5e29ec1 Merge changes from topic "expose_flagged_api_revert" into main 
* changes:
  Revert^2 "Add flagged api hide conditional to droidstubs"
  Revert^2 "Add soong config variable Release_expose_flagged_api"
 2023-10-03 17:55:16 +00:00
Spandan Das
29af2a470d Merge "Handle symlinks in isPackageBoundary" into main 2023-10-03 17:51:41 +00:00
Zi Wang
066f962bb6 Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58 am: 8cae29f34c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: I648da6c30478bb08824c4a91d79439164bf65cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:44:04 +00:00
Yu Liu
7a90fcfa45 Merge "Convert java_aconfig_library to bazel." into main 2023-10-03 17:29:26 +00:00
Zi Wang
8cae29f34c Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: Ib863c47261892d3cd594f3afd31475491a2def04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:12:01 +00:00
Colin Cross
b716ceb832 Don't delete withres-withoutdex jar from R8 rules 
R8 rules produce a depfile generated by R8.  R8 sees the withres-withoutdex
jar as an input, and so adds it to the depfile.  If the jar is deleted
after running R8 then ninja will always consider the rule dirty, as the
input file listed in the depfile is missing.

Fixes: 303064127
Test: m Calendar && m Calendar
Test: m framework-minus-apex &&  m framework-minus-apex
Change-Id: I5cbd780b56fc131b58598d6e569a8a78b7fe9395
 2023-10-03 16:42:48 +00:00
Zi Wang
33befd0c58 Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main 2023-10-03 16:31:29 +00:00