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 |
|
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
|
8350145404
|
Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 am: 2ba08f1fe9 am: dde52d1dea am: 80bffb2dae am: b20546dc8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207
Change-Id: I78d5b6500839f5ca953e352c68aa10c67efda04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 20:43:04 +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 |
|
Jihoon Kang
|
11d3eb2a61
|
[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: a2d79f94aa -s ours am: b75aea3aed -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: I065e1f2a8b5b38b7808a1dbb683caafd62d06df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 20:32:57 +00:00 |
|
Jihoon Kang
|
abf5b5ac89
|
[automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 5623aa81e1 -s ours am: 759274416e -s ours am: 73fdf985c6 -s ours am: 5a326d2130 -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: Ifb91085111edfb41b52619403a1f4e740752d457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 20:32:53 +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 |
|
Trevor Radcliffe
|
b20546dc8e
|
Merge "Revert "Block CFI on static libraries"" into main am: 44e4102362 am: 2ba08f1fe9 am: dde52d1dea am: 80bffb2dae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758207
Change-Id: I9e76d71314dd1221d42ba57b70ac3d47c2d14237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:28:28 +00:00 |
|
Treehugger Robot
|
67ed7fb070
|
Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a473 am: f7566167dd am: 7204781c24 am: e104c2d9e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759108
Change-Id: I4c915a667e8788ef7ccc97975e911b8fa3bd7260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:27:21 +00:00 |
|
Yu Liu
|
84997df772
|
Merge "Convert cc_aconfig_library to bazel." into main am: 62f7302701 am: b84a5aaec3 am: a77dff0ecf am: 7412dd35ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751020
Change-Id: I549e17108b8400d2afc8536c57278580b966e3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:27:05 +00:00 |
|
Jihoon Kang
|
b75aea3aed
|
[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: a2d79f94aa -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: Ic73d30dffb01c0fd2ba785e5e471edfb35518d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:25:14 +00:00 |
|
Jihoon Kang
|
5a326d2130
|
[automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 5623aa81e1 -s ours am: 759274416e -s ours am: 73fdf985c6 -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: Iffd51557f0084693e72df8c6fee67b6d56edc394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:25:10 +00:00 |
|
Spandan Das
|
2dc30e6360
|
Merge "Always convert ndk_library" into main am: 02f2211931 am: 5c4debfcd3 am: 65613d5501 am: bf9f65841c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753345
Change-Id: I390fe3e4c6860a7ea061686e2944be412d753e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 19:24:56 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Jingwen Chen
|
515399236a
|
Merge "Revert "bp2build converter for android_test_helper_app."" into main am: 38b7be9d29 am: 050f0fa35b am: 7f2170b57f am: d6f57802cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759106
Change-Id: I32f390a920cbf9270c5c25dd416e57b0d2552689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 17:37:48 +00:00 |
|
Jingwen Chen
|
9444e10496
|
Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 am: 915ddd751b am: 47eb84435b am: 0c83759827
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525
Change-Id: Ifb991c2b2a6c8e62e23ef7828eef2e677b807972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-09-21 17:37:20 +00:00 |
|