StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,065 Commits 1 Branch 0 Tags
80a0b71ece09537ba5c2f040be260c983bd363c4
Commit Graph

75065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Yun
80a0b71ece Merge "Generate product variants by default" into main am: ce12ea8f95 am: dead374d4d am: 955b380660 am: 3b5053ee1f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2762829

Change-Id: I4823fea1eb92407ed33eb72c9bf698321a3566d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 08:40:05 +00: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
Treehugger Robot
2da00b660e Merge changes Ib2667798,I9a1fa32b into main am: 4cbd49810c am: 31f5c0d738 am: 632e6360d1 am: b8246fbafe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771005

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

Change-Id: I4964e2ce3165767054463866e90afc1c8717575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 01:58:06 +00: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
3941e8bc58 Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f am: e77d2e4197 am: 5836515d26 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925

Change-Id: Ia125b1f5c7867118137d8e09a09e8cf852604b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 21:26:31 +00: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
Mark Dacek
0b7b300513 Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8 am: 4ea798d3fd am: 03785bb591 am: 50929ce3f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443

Change-Id: If39f17332c9288f8aeccf7f04a0bc0d3ac406e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 20:40:34 +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
Jihoon Kang
2e660fdb2c Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1 am: 3d1cecda28 am: 40386ed37e am: f9503e962b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001

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

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

Change-Id: Idb47c1ac9d42980834cea01e8b7500282c49afe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:36: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
Zi Wang
3b1bbe2f50 Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58 am: 8cae29f34c am: 066f962bb6 am: 1772066f60 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103

Change-Id: I37c861266367a8816e08f2ec5058e543721912b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:48:44 +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
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
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
Vinh Tran
df750db73a Merge "Change bp2build to switch to using custom fdo_profile macro" into main am: 85455887b7 am: 63838903f1 am: 75530cd58b am: b46358fcb3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763705

Change-Id: Ib384fe8a4ec6bf3d94c82e8fbadf574fe5ba1949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:44:13 +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
Vinh Tran
b46358fcb3 Merge "Change bp2build to switch to using custom fdo_profile macro" into main am: 85455887b7 am: 63838903f1 am: 75530cd58b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763705

Change-Id: I6337fd0233bb5b803a0555c62d31a342c4207dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 16:38:12 +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