StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,865 Commits 1 Branch 0 Tags
d342890e99fb15d2bc83a7dc58f29e8d662fd84c
Commit Graph

7221 Commits

Author SHA1 Message Date
Motomu Utsumi
476ba87553 Merge "Remove unused file path" into main am: 9c5b51e4f6 am: e8a0f01c8e am: ea5f47b643 am: 24a2256380 am: ab9cc55552 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759105

Change-Id: Ib505b7aab02ffa9883f9fe6a8dda4f3bcfcdd755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 06:28:58 +00:00
Spandan Das
8efeaa51f3 Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 am: 71df5ce60d am: 50910138fa am: 219eeba24a am: aa7f560311 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

Change-Id: Ic1da3f1437d504ce608368fd400148a472a5d179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 03:46:52 +00:00
Zi Wang
35dfe4598a Merge "Allowlist grpc-java and its deps" into main am: 0dc9d095b4 am: d0f497825c am: f33eefb313 am: d9f94abc68 am: fb828f00e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754985

Change-Id: Ib2be6a40bb5e14f1247ec4bde9b3180b87af6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 03:42:48 +00:00
Motomu Utsumi
e8a0f01c8e Merge "Remove unused file path" into main am: 9c5b51e4f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759105

Change-Id: I480d6fd45deb303cf0cf356f8347669b1a45cfff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 02:49:03 +00:00
Motomu Utsumi
9c5b51e4f6 Merge "Remove unused file path" into main 2023-09-22 02:06:54 +00:00
Cole Faust
8c975fe097 Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e am: df432bae53 am: 75e0bbda5d am: 9ebc3db2aa am: abd4e112fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I1c81ece8ab89688cbfdf2f3945e77b41d2cd34b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 01:00:05 +00:00
Spandan Das
71df5ce60d Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

Change-Id: I41d485cba0736761c9b7c0e5bc538384091d040b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 00:03:18 +00:00
Zi Wang
d0f497825c Merge "Allowlist grpc-java and its deps" into main am: 0dc9d095b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754985

Change-Id: I454d7c3f6ef985a6f6c66fcfdbc1466645390851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 00:03:04 +00:00
Spandan Das
7ba007a3c6 Merge "Create a bp2build converter for ndk_headers" into main 2023-09-21 23:11:33 +00:00
Zi Wang
0dc9d095b4 Merge "Allowlist grpc-java and its deps" into main 2023-09-21 22:52:34 +00:00
Cole Faust
df432bae53 Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I971f7983f3a3550269f85f96035003edba292ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:56 +00:00
Cole Faust
747ecf4b1e Merge "Decouple the target build variant from the platform" into main 2023-09-21 21:18:47 +00:00
Treehugger Robot
81e13e0144 Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a473 am: f7566167dd am: 7204781c24 am: e104c2d9e6 am: 67ed7fb070 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759108

Change-Id: I1cebc1329ed7d6947f9d2fb6995af3e2f2f87097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 20:41:43 +00:00
Yu Liu
de160f7db1 Merge "Convert cc_aconfig_library to bazel." into main am: 62f7302701 am: b84a5aaec3 am: a77dff0ecf am: 7412dd35ad am: 84997df772 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751020

Change-Id: Ie40ddf0ca1f27fb9832de0cbe9fa3029bf9ecdea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 20:35:42 +00:00
Spandan Das
984d556124 Merge "Always convert ndk_library" into main am: 02f2211931 am: 5c4debfcd3 am: 65613d5501 am: bf9f65841c am: 2dc30e6360 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753345

Change-Id: Ib778727c813fd3566692a1a9ac5d07487774b2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 20:32:38 +00:00
Jingwen Chen
e56207c1e5 Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 am: 050f0fa35b am: 7f2170b57f am: d6f57802cd am: 515399236a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I032f0304c29578e2bdc2747932422e98f30486b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:44:31 +00:00
Jingwen Chen
dbdfa2d5a3 Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 am: 915ddd751b am: 47eb84435b am: 0c83759827 am: 9444e10496 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

Change-Id: Iad45e344f465500e9fa7f86845e74e0d1e6fd27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:42:38 +00:00
Romain Jobredeaux
3aeb6d8a04 Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d am: 4bc34aa84e am: 5610f9ceb6 am: 6d9298ad44 am: 5eac3091ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: I9b715696156db43585687ec516e657bf68e171bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:41:04 +00:00
Treehugger Robot
f7566167dd Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a473 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759108

Change-Id: I9457cfd0e55045b6b5d5814999751891eed934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:40:19 +00:00
Yu Liu
b84a5aaec3 Merge "Convert cc_aconfig_library to bazel." into main am: 62f7302701 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751020

Change-Id: I226eb08792eefe5750f4343dc0778176e89703d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:39:31 +00:00
Treehugger Robot
a56002a473 Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main 2023-09-21 17:56:35 +00:00
Yu Liu
62f7302701 Merge "Convert cc_aconfig_library to bazel." into main 2023-09-21 17:43:07 +00:00
Liz Kammer
9ec5a7416d Merge "Add keep sorted tags" into main am: 53b33d07b1 am: 588e2a497e am: d42b7f2414 am: d3d3402eb9 am: ce7dcda9a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

Change-Id: I321a9c21615b621829b7ce3f72dddec7182c9339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:57:20 +00:00
Liz Kammer
0959cf0099 Merge "Handle prebuilt vs source selection in bp2build" into main am: af7c166f10 am: e29da0ff11 am: 997cd6dd8a am: cb6b6ee3d0 am: c25487cc92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755386

Change-Id: Ia0b8e3e01e21dd1a2d7b8334526a4f479bb7ae42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:55:49 +00:00
Spandan Das
5c4debfcd3 Merge "Always convert ndk_library" into main am: 02f2211931 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753345

Change-Id: Ia4b3796b68bf568d1d88410826882220cc25cae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:53:37 +00:00
Zi Wang
63fc0f6292 Allowlist grpc-java and its deps 
Test: CI

Bug: 300135965
Change-Id: I8d7b320a17c4070badd3224e8408be6dd2599d19
 2023-09-21 09:41:09 -07:00
Spandan Das
02f2211931 Merge "Always convert ndk_library" into main 2023-09-21 16:18:49 +00:00
Jingwen Chen
050f0fa35b Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I2c0c4621425d709ee3d98bdeaf5ebe00a0ee3aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:00:14 +00:00
Jingwen Chen
915ddd751b Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

Change-Id: I6ce6183e2ae3a2a0ebc5dfc8884fb27268831a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:59:43 +00:00
Jingwen Chen
6528999872 Revert^2 "bp2build converter for android_test_helper_app." 
2395286cda

Change-Id: I698c1e62b87f3d8338d8d207d06f62ec680d71c9
 2023-09-21 15:16:59 +00:00
Jingwen Chen
38b7be9d29 Merge "Revert "bp2build converter for android_test_helper_app."" into main 2023-09-21 15:14:29 +00:00
Jingwen Chen
2395286cda Revert "bp2build converter for android_test_helper_app." 
Revert submission 2757525-android_test_helper_app

Reason for revert: broke builds

Reverted changes: /q/submissionid:2757525-android_test_helper_app

Change-Id: I0e5f55078221d7f2151f1bbaa55bebdf5051c03c
 2023-09-21 15:12:19 +00:00
Jingwen Chen
72e22018c3 Merge "bp2build converter for android_test_helper_app." into main 2023-09-21 15:09:06 +00:00
Romain Jobredeaux
4bc34aa84e Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: Ie3d0fefd42a14038e97cbecb5e93f677dca3cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:04:52 +00:00
Romain Jobredeaux
1c4048e08d Merge "Bp2build support for JNI deps of android_app." into main 2023-09-21 14:36:02 +00:00
Liz Kammer
588e2a497e Merge "Add keep sorted tags" into main am: 53b33d07b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

Change-Id: I211078ec021eab35ef03fcade46b9cbfe09b0a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:18:10 +00:00
Liz Kammer
e29da0ff11 Merge "Handle prebuilt vs source selection in bp2build" into main am: af7c166f10 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755386

Change-Id: I6a38effb18b47b4eb4d858290bc4f8d245b4ccd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:17:48 +00:00
Liz Kammer
53b33d07b1 Merge "Add keep sorted tags" into main 2023-09-21 12:16:10 +00:00
Liz Kammer
af7c166f10 Merge "Handle prebuilt vs source selection in bp2build" into main 2023-09-21 12:15:54 +00:00
Motomu Utsumi
fca0ccc744 Remove unused file path 
frameworks/libs/net was moved to the packages/modules/Connectivity

Bug: 296014682
Test: TH
Change-Id: I1c17eb0cb4a2d6d2526b26fd800f206e93d4e009
 2023-09-21 11:38:14 +00:00
Treehugger Robot
7730b46857 Merge changes I8cf28041,If271c5f7 into main am: 59da77e19c am: 03de3b588f am: 69a4699ae4 am: fd1993dc41 am: 4e06f6bbb2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756946

Change-Id: Ib56cbac31aba7636e3ef1ae4dc116fb77f411a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 07:02:56 +00:00
Treehugger Robot
03de3b588f Merge changes I8cf28041,If271c5f7 into main am: 59da77e19c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756946

Change-Id: I5b241be4e9f1c01f7e96f0397c80c3b52b6e29e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 03:26:30 +00:00
Yu Liu
855cfc2fac Convert cc_aconfig_library to bazel. 
Bug: 297358249
Test: Unit test and CI
Change-Id: Ic84128b0df16efe4255b52b83670ec9902c09383
 2023-09-20 17:46:46 -07:00
Cole Faust
f3cf34e096 Decouple the target build variant from the platform 
Bug: 301334589
Test: Presubmits
Change-Id: Id8ac0874a2d132d9965e339fd8dc705a7434bffb
 2023-09-20 17:08:30 -07:00
Spandan Das
319711b0bc Create a bp2build converter for ndk_headers 
And add this module type to alwaysConvertList

Test: go test ./bp2build
Bug: 300504837
Change-Id: Ic09738ab47e7c497287b73de0f952d52aa78dd17
 2023-09-20 23:04:02 +00:00
Spandan Das
e993475ca6 Always convert ndk_library 
This soong module will be converted to a cc_stub_suite macro in the
bp2build workspace

Test: TH
Bug: 298085502
Change-Id: I32a1a908d292e04b43d9be3efe7b16d1e4534466
 2023-09-20 23:04:02 +00:00
Spandan Das
1262f359a4 Allowlist jni_libs and transitive deps of b/297405812 
This is an internal android_test (for now), but the deps are in aosp

Bug: 297405812
Test: TH
Change-Id: If271c5f7d159eafd9db739c2699e4470ce44c825
 2023-09-20 23:04:02 +00:00
Sam Delmerico
5fabd059e6 Merge changes from topics "revert-2746976-revert-2605644-rulebuilder-ninja-vars-OAAWYCDDLT-KMAGKVIXAT", "sandbox-rust-inputs" into main am: 52d1cc334b am: 631a5ea5f9 am: db48881076 am: 05fdd8f82f am: 4d09da5870 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629131

Change-Id: I982cee72bd31039fff9a785782603662ce075685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 22:59:46 +00:00
Sam Delmerico
52e68bd7ac conditionally escape rule builder command am: d96a60685a am: 8e80e4a155 am: 58f55186fe am: 33dc412d2a am: 535914890e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751019

Change-Id: I7f2ca2fcf0acbcc0b5118c79c62adc53e21cd62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 22:59:44 +00:00
Sam Delmerico
d14a48ee83 Revert^2 "allow Ninja variables in RuleBuilder API" am: 0e2d63e4d2 am: 346f0c6242 am: 8d65403047 am: 8a68b1e858 am: 1ba0c6cc84 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746468

Change-Id: I8e042d25d1ba5099a1826e58c643b8f547e67669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 22:59:41 +00:00