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
Jihoon Kang
d342890e99 [automerger skipped] Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp am: 0fbb6e2502 am: cdadb8a22f am: b8a1ec844a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6e1650630125098756e986cd727c49a5e5de397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:13:50 +00:00
Jihoon Kang
b1972dd671 [automerger skipped] RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp am: 818f3d9485 am: de73e28bd0 am: 8d6d4bfd95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iafda7f36d07f2c47f35c34e26501a9e3dc44e5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:13:46 +00:00
Alix Espino
b8f84acee8 Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea am: ea88c79b2e am: 540f688f3f am: 0f75212971 am: 4a60c10598 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: Ie0b328aee779de433b286d2f7e612b902a7f19ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:13:02 +00:00
Liz Kammer
c36126fdb1 Merge "Do not convert non-unit tests." into main am: 596ee5c82d am: bf659c7d36 am: 0b7fbfdcaf am: f2cc7f91cf am: 2a092316d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748517

Change-Id: I752e24f78efb2d7f74a2eae067d17b7f3921cf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:11:19 +00:00
Jihoon Kang
b8a1ec844a Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp am: 0fbb6e2502 am: cdadb8a22f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24831467

Change-Id: I0a469b352e4bd0d3aea6736ad9890899a9fca401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:58:58 +00:00
Jihoon Kang
8d6d4bfd95 RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp am: 818f3d9485 am: de73e28bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24831467

Change-Id: I3fac81f16d7bb24930af1e3be4846124a093fe4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:58:52 +00:00
Jihoon Kang
cdadb8a22f Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp am: 0fbb6e2502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24831467

Change-Id: I30d5208ad3dfbb17b2e24e5d1ebbe64242766612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:18:18 +00:00
Jihoon Kang
de73e28bd0 RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp am: 818f3d9485 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24831467

Change-Id: Ifd6c5cd2ab9a15fb7ac6f2671c2cf9783e545fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:18:14 +00:00
Alix Espino
4a60c10598 Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea am: ea88c79b2e am: 540f688f3f am: 0f75212971 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: Idac7e580411bf0c0edf32dee58a8109f71dfa504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:06:03 +00:00
Liz Kammer
2a092316d5 Merge "Do not convert non-unit tests." into main am: 596ee5c82d am: bf659c7d36 am: 0b7fbfdcaf am: f2cc7f91cf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748517

Change-Id: I852bc7832a1cd428e954344b7ad599d0123fe9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:05:19 +00:00
Jihoon Kang
0fbb6e2502 Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp 2023-09-22 16:38:24 +00:00
Alix Espino
0f75212971 Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea am: ea88c79b2e am: 540f688f3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: Iafc7ac29a4d368eef62184681e0bd4767f40f143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 16:24:41 +00:00
Liz Kammer
f2cc7f91cf Merge "Do not convert non-unit tests." into main am: 596ee5c82d am: bf659c7d36 am: 0b7fbfdcaf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748517

Change-Id: Ib9c02c6f9636fa36459aa760a6c9105c974bbf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 16:23:43 +00:00
Alix Espino
540f688f3f Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea am: ea88c79b2e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: Iad5a2b58ed2c08e7d35ade80ec23d1552e06e937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:30:57 +00:00
Liz Kammer
0b7fbfdcaf Merge "Do not convert non-unit tests." into main am: 596ee5c82d am: bf659c7d36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748517

Change-Id: I26b00965bdce45e1b33861ca54d5627122b8d6cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:30:28 +00:00
Treehugger Robot
83894c731a Merge "Use assemble_vintf output for vintf fragments in APEX" into main am: 64a2cc1a9a am: 0d542860f1 am: 00677dad5b am: 2aa33b884c am: 8a6a792848 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760325

Change-Id: Ifa341f18d4e0f2ae4c23735751cc29c17956f9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:28:03 +00:00
Alix Espino
ea88c79b2e Merge "Mark android_* modules with java_resources as unconvertible" into main am: c62b27a7ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752994

Change-Id: I5d5d1e5335948d51d78fece3fddaa233a4a5f401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:27:07 +00:00
Alix Espino
c62b27a7ea Merge "Mark android_* modules with java_resources as unconvertible" into main 2023-09-22 14:56:18 +00:00
Liz Kammer
bf659c7d36 Merge "Do not convert non-unit tests." into main am: 596ee5c82d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748517

Change-Id: I91de11db95c8d4c42dd84b461a36495116ea1044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 14:32:23 +00:00
Treehugger Robot
8a6a792848 Merge "Use assemble_vintf output for vintf fragments in APEX" into main am: 64a2cc1a9a am: 0d542860f1 am: 00677dad5b am: 2aa33b884c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760325

Change-Id: I7102ed5b94517eeabe63661062c0e73118faab46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 14:23:15 +00:00
Liz Kammer
596ee5c82d Merge "Do not convert non-unit tests." into main 2023-09-22 14:08:53 +00:00
Treehugger Robot
2aa33b884c Merge "Use assemble_vintf output for vintf fragments in APEX" into main am: 64a2cc1a9a am: 0d542860f1 am: 00677dad5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760325

Change-Id: Icd39a80a138b8d7a2f1e79ffbe41b0e866b2da05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 13:42:00 +00:00
Treehugger Robot
00677dad5b Merge "Use assemble_vintf output for vintf fragments in APEX" into main am: 64a2cc1a9a am: 0d542860f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760325

Change-Id: Ia72010611de2b67049e85e575cdb2755edf66676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 12:48:28 +00:00
Treehugger Robot
0d542860f1 Merge "Use assemble_vintf output for vintf fragments in APEX" into main am: 64a2cc1a9a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760325

Change-Id: Iaea6c7f793249c441ee6fa102affd0f011ab27f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 11:48:55 +00:00
Treehugger Robot
64a2cc1a9a Merge "Use assemble_vintf output for vintf fragments in APEX" into main 2023-09-22 11:23:04 +00:00
Jooyung Han
90934ac906 Use assemble_vintf output for vintf fragments in APEX 
With aosp/2681229, assemble_vintf modifies the input, instead of
checking. APEX should use the output of assemble_vintf instead of
running it as validation.

Bug: 299034304
Test: m
Change-Id: I9446908e1df85b4f3f89d29ebe9cace3982d7757
 2023-09-22 15:47:15 +09:00
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
Motomu Utsumi
ab9cc55552 Merge "Remove unused file path" into main am: 9c5b51e4f6 am: e8a0f01c8e am: ea5f47b643 am: 24a2256380 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759105

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

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

Change-Id: I8ba30880656e87520a926101be20294b18fe48a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 03:47:33 +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
Spandan Das
aa7f560311 Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 am: 71df5ce60d am: 50910138fa am: 219eeba24a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

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

Change-Id: Id83ee5ffd418ee237dadc315887ea3068e4d21af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 02:37:51 +00:00
Motomu Utsumi
9c5b51e4f6 Merge "Remove unused file path" into main 2023-09-22 02:06:54 +00:00
Spandan Das
219eeba24a Merge "Create a bp2build converter for ndk_headers" into main am: 7ba007a3c6 am: 71df5ce60d am: 50910138fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756529

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

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

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

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

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

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

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

Change-Id: I407abbdbd0ec6df61c29d796a2dfdd7be5ecff6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 23:54:35 +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