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

73615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Parsons
51da529229 Merge "Handle already existing targets of different name" into main am: 68a3d9b33e am: 07eb212463 am: c85ebf33fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611

Change-Id: I51f73d25b30bac5e4cacd3173210c317b7dfd365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 21:49:40 +00:00
Christopher Parsons
c85ebf33fe Merge "Handle already existing targets of different name" into main am: 68a3d9b33e am: 07eb212463 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611

Change-Id: I943d5eaeb10d897d8fedc99eeb5e5d19638ab438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 20:54:58 +00:00
Christopher Parsons
07eb212463 Merge "Handle already existing targets of different name" into main am: 68a3d9b33e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611

Change-Id: I0e37761d86b7eea343b6dc96ed5124358e4e70ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 19:55:56 +00:00
Sam Delmerico
95683f7449 Merge changes I620cfd7b,I8ed1919a into main am: eba2a2af22 am: 69a7b4dbb4 am: 4934d3d722 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758566

Change-Id: I08cb06eb3213b481ddb7e371920bf9c906336297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 19:06:16 +00:00
Christopher Parsons
68a3d9b33e Merge "Handle already existing targets of different name" into main 2023-09-22 18:52:07 +00:00
Sam Delmerico
4934d3d722 Merge changes I620cfd7b,I8ed1919a into main am: eba2a2af22 am: 69a7b4dbb4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758566

Change-Id: I28e86daf34457f9aae1efd28ec29cd85fe46186c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 18:12:42 +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
Sam Delmerico
69a7b4dbb4 Merge changes I620cfd7b,I8ed1919a into main am: eba2a2af22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758566

Change-Id: Ia43deae729c4f8958ebb696d098c95901845a248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 17:14:45 +00:00
Sam Delmerico
eba2a2af22 Merge changes I620cfd7b,I8ed1919a into main 
* changes:
  remove rust deps on clang prebuilts
  rustSetToolchainSource to use linux-x86 srcs
 2023-09-22 16:44:02 +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
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
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
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
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
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
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
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