StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,737 Commits 1 Branch 0 Tags
f1037ec0eb82fe524760568f94e24d86cf38a7c6
Commit Graph

73737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zi Wang
f33eefb313 Merge "Allowlist grpc-java and its deps" into main am: 0dc9d095b4 am: d0f497825c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754985

Change-Id: I6025302e3742658043d4eedd9d4510b846083dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 01:01:46 +00:00
Jihoon Kang
818f3d9485 RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp 
This change was already submitted with
https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22
but was never propagated to downstream.

Ignore-AOSP-First: change already merged in aosp

Test: m nothing --build-from-text-stub
Change-Id: I1f2f33e1a5df6f7b8f8215ab41b41228fa873ea1
 2023-09-22 00:29:17 +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
Cole Faust
9ebc3db2aa Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e am: df432bae53 am: 75e0bbda5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I05d6ca84e5a2b3c6421f62b04c322128408a9f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 23:13:56 +00:00
Romain Jobredeaux
b0a1d0a1a0 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main am: 2c11851598 am: 09ac546858 am: 4ed82da99d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752828

Change-Id: I27d538a0b9542695465fd6927ef0970646a86ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 23:13:17 +00:00
Christopher Parsons
2a54365a75 Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496e0 am: 4bd587ec2f am: ac61ee07d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759605

Change-Id: I5b71316628a3228e8cc4fd8b55e33c4f3736e4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 23:13:08 +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
75e0bbda5d Merge "Decouple the target build variant from the platform" into main am: 747ecf4b1e am: df432bae53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758405

Change-Id: I1f09987535cf0d975de82af701bf3bab0a23eab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 22:21:55 +00:00
Romain Jobredeaux
4ed82da99d Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main am: 2c11851598 am: 09ac546858 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752828

Change-Id: I65a7058271eee0e268c150b3ff190aa7bc71f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 22:21:20 +00:00
Christopher Parsons
ac61ee07d1 Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496e0 am: 4bd587ec2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759605

Change-Id: I44aae268d9a020531576aa4ef70e3465ecbf1330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 22:21:12 +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
Romain Jobredeaux
09ac546858 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main am: 2c11851598 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752828

Change-Id: I3727cd61852af5a5bf1450252f2e3752d3918de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:25 +00:00
Christopher Parsons
4bd587ec2f Merge "Refactor some tests to not use bp2build_avail" into main am: 92c59496e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759605

Change-Id: Idad223f4b0b0c3ceda0c1df7746ef7912f357910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 21:24:11 +00:00
Cole Faust
747ecf4b1e Merge "Decouple the target build variant from the platform" into main 2023-09-21 21:18:47 +00:00
Jihoon Kang
6be0f00671 Remove api_files property from java_api_library 
java_api_contribution provides api_surface information, but files
directly passed to java_api_library do not possess such information.
Currently, the api surface is assumed via naming convention for api
files passed via api_files property, but this is fragile.

This change removes the api_files property from java_api_library and
enforce all api files to be passed via java_api_contribution

Test: m nothing --build-from-text-stub
Bug: 300964421
Change-Id: If01d9ed978fe469d4ee0d685582a51629ebecc56
 2023-09-21 21:02:39 +00:00
Chris Parsons
0c4de1f234 Handle already existing targets of different name 
In other words, if, in bp2build, module "foo" would generate "foo",
and "foo_two", and "foo_two" already exists in a build file,
bp2build should label "foo" as being unconvertible.

Fixes: 301321658
Fixes: 301312582
Bug: 285631638
Test: Unit tests
Test: Verified that `m bp2build` results in bit-for-bit identical
contents for out/soong/bp2build before and after this change.

Change-Id: Icbbdd69fce83579ec9b172d04b2bf1f294698f70
 2023-09-21 20:58:25 +00:00
Romain Jobredeaux
2c11851598 Merge "Use raw {min,target}_sdk_version properties in android_app converter" into main 2023-09-21 20:58:16 +00:00
Christopher Parsons
92c59496e0 Merge "Refactor some tests to not use bp2build_avail" into main 2023-09-21 20:57:33 +00:00
Trevor Radcliffe
80bffb2dae Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 am: 2ba08f1fe9 am: dde52d1dea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207

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

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

Change-Id: I63d28ec9401ad402fed755bdd9ae9a8bba2dc7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:49:01 +00:00
Jihoon Kang
a2d79f94aa [automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 17728c0939 -s ours am: 1e1a13ea44 -s ours 
am skip reason: Merged-In If66b5bba719bb389a69f2353d2218a89b2b96b90 with SHA-1 b6ec2c8ea0 is already in history

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

Change-Id: Id3307bed253270b2e0cb00c699c0ccd630d8971f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:48:22 +00:00
Jihoon Kang
73fdf985c6 [automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 5623aa81e1 -s ours am: 759274416e -s ours 
am skip reason: Merged-In If66b5bba719bb389a69f2353d2218a89b2b96b90 with SHA-1 b6ec2c8ea0 is already in history

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

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

Change-Id: I4023c394f86fff8ba4c1f3d3fc7a83e231adf7e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:48:06 +00:00
Trevor Radcliffe
dde52d1dea Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 am: 2ba08f1fe9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207

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

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

Change-Id: I2acac6761a34e100433252e93985640b5a78cdf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:45:14 +00:00
Jihoon Kang
1e1a13ea44 [automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 17728c0939 -s ours 
am skip reason: Merged-In If66b5bba719bb389a69f2353d2218a89b2b96b90 with SHA-1 b6ec2c8ea0 is already in history

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

Change-Id: I2f0bf86c595f27028cf5ed444f29d94b25805aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:44:22 +00:00
Jihoon Kang
759274416e [automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 5623aa81e1 -s ours 
am skip reason: Merged-In If66b5bba719bb389a69f2353d2218a89b2b96b90 with SHA-1 b6ec2c8ea0 is already in history

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

Change-Id: I150c1715221b79be496081b4d8dd571291822029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:44:19 +00:00
Trevor Radcliffe
2ba08f1fe9 Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207

Change-Id: Id2de5234f04730be8a60be7387c5b011bcc0731a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 18:40:46 +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
Liz Kammer
0db75201a9 Add system/tools/hidl to allowlist 
Test: b build //system/tools/hidl/...
Test: b build //system/tools/hidl/... --config=android
Change-Id: I28d0e50aa91b193309029655460edbacec21c1c0
 2023-09-21 14:27:44 -04:00
Liz Kammer
80b54d2502 Do not convert non-unit tests. 
Test: CI
Change-Id: Iab9c134718351187859f34a26bd3a2aa66e009d5
 2023-09-21 14:27:42 -04:00
Jihoon Kang
17728c0939 Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future 2023-09-21 18:17:05 +00:00
Trevor Radcliffe
44e4102362 Merge "Revert "Block CFI on static libraries"" into main 2023-09-21 18:15:25 +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
Spandan Das
65613d5501 Merge "Always convert ndk_library" into main am: 02f2211931 am: 5c4debfcd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753345

Change-Id: I2e0a74c500a04ae59d76caf83279dfec3d86f45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 17:51:48 +00:00
Yu Liu
62f7302701 Merge "Convert cc_aconfig_library to bazel." into main 2023-09-21 17:43:07 +00:00
Chris Parsons
4c81ce0307 Refactor some tests to not use bp2build_avail 
Bug: 301312260
Test: presubmits
Change-Id: I67ca45f17d11e9b893fae5f6c6df1239ae4220b6
 2023-09-21 17:08:09 +00:00
Trevor Radcliffe
85d55c2847 Revert "Block CFI on static libraries" 
This reverts commit f9abec0987.

Reason for revert:
https://b.corp.google.com/issues/301444094
https://b.corp.google.com/issues/301443813
https://b.corp.google.com/issues/301437374

Change-Id: I6fd03e4d3c0930005178ad347f53156be8f15efc
 2023-09-21 17:04:43 +00:00
Jingwen Chen
d6f57802cd Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 am: 050f0fa35b am: 7f2170b57f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

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

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

Change-Id: Ie4513905931ebb89bb0f123ca1dae41a7cd29245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:57:41 +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
7f2170b57f Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 am: 050f0fa35b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106

Change-Id: I0adb36e537dd590d827669b76fafce2a92eef479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:04:58 +00:00