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

76865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Jobredeaux
5eac3091ca Merge "Bp2build support for JNI deps of android_app." into main am: 1c4048e08d am: 4bc34aa84e am: 5610f9ceb6 am: 6d9298ad44 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2622674

Change-Id: I021f212a6fb18e910df5b95377684ce39317dfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 17:37:10 +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
Trevor Radcliffe
0551ed240c Merge "Block CFI on static libraries" into main am: 9483e4873c am: 12be5967fd am: 0fe98a99dc am: 98febc2324 am: 335e295534 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: Ia257453a76c609d199b76c98e1743e71f56ae100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:57:45 +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
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
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
Jingwen Chen
47eb84435b Merge "bp2build converter for android_test_helper_app." into main am: 72e22018c3 am: 915ddd751b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757525

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

Change-Id: I7fbd8985c92404e17bd5b58ec2c173f869585967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 16:04:20 +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
Trevor Radcliffe
335e295534 Merge "Block CFI on static libraries" into main am: 9483e4873c am: 12be5967fd am: 0fe98a99dc am: 98febc2324 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: I9b72f5c8c6eda4a940197e95690387337a157f13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:51:49 +00:00
Liz Kammer
ce7dcda9a3 Merge "Add keep sorted tags" into main am: 53b33d07b1 am: 588e2a497e am: d42b7f2414 am: d3d3402eb9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

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

Change-Id: I8522a77a62beae11abe06572926df9d227a10b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:50:15 +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
Trevor Radcliffe
98febc2324 Merge "Block CFI on static libraries" into main am: 9483e4873c am: 12be5967fd am: 0fe98a99dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: I3da266fb6bb53389742fd3675584cf892c072515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:10:10 +00:00
Liz Kammer
d3d3402eb9 Merge "Add keep sorted tags" into main am: 53b33d07b1 am: 588e2a497e am: d42b7f2414 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

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

Change-Id: I00c182b5f9bccfd6940de666cf7e234d7be65722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 15:09:23 +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
Trevor Radcliffe
0fe98a99dc Merge "Block CFI on static libraries" into main am: 9483e4873c am: 12be5967fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: I5282f5e560d5c2a8cc8ab8b12773ee007c47621c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 14:17:21 +00:00
Liz Kammer
d42b7f2414 Merge "Add keep sorted tags" into main am: 53b33d07b1 am: 588e2a497e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755387

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

Change-Id: I1f4863ba8bb3dce5ebbdcd08a0d3f7d6324ea44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 14:16:46 +00:00
Trevor Radcliffe
12be5967fd Merge "Block CFI on static libraries" into main am: 9483e4873c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706817

Change-Id: I0c1d85bf958537d69c60ac03523a867027d3ae0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 13:18:20 +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
Trevor Radcliffe
9483e4873c Merge "Block CFI on static libraries" into main 2023-09-21 13:05:21 +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
7de00ec808 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd am: 2b93f0cfb9 am: b308573038 am: 7a3a115e31 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

Change-Id: I4e87e0940a9cbf4d6dd73962fc091e5c6bff72a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 07:05:20 +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
7a3a115e31 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd am: 2b93f0cfb9 am: b308573038 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

Change-Id: I9ddc11a7d2b7274325c2abe755e5b85c3eeb28c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 05:58:45 +00:00
Treehugger Robot
4e06f6bbb2 Merge changes I8cf28041,If271c5f7 into main am: 59da77e19c am: 03de3b588f am: 69a4699ae4 am: fd1993dc41 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756946

Change-Id: Icb6d448a312d41be62d8eeb6329d351ce12421e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 05:57:45 +00:00
Treehugger Robot
b308573038 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd am: 2b93f0cfb9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

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

Change-Id: I6ca293721b1051576b90f8bdeb317122a03f200f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 05:17:18 +00:00
Jihoon Kang
5623aa81e1 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
Merged-In: If66b5bba719bb389a69f2353d2218a89b2b96b90
Change-Id: Ia6867e8e4f8f57a2bbb0b763e7e11c7a6a76fdfd
 2023-09-21 04:53:39 +00:00
Treehugger Robot
2b93f0cfb9 Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 am: a1b17990dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

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

Change-Id: Idb7d01a0955b56f618c1c4456e451a3c4e1186b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 04:24:20 +00:00
Treehugger Robot
a1b17990dd Merge "Mark android apps with jni_uses_*_apis as unconvertible" into main am: 8d3ea47ec1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755569

Change-Id: I1fc63295438b1e33ab5d7a21dfdc21f8469f7507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 04:20:01 +00:00
Alix
ee51bd6588 Mark android_* modules with java_resources as unconvertible 
Change-Id: I9da921feaf9edb5fe7d1b1cb733494f90d8c64b3
BUG: 300470246
 2023-09-21 03:58:24 +00:00