StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,627 Commits 1 Branch 0 Tags
1e692ed0876b0caaa646b101b7e456b5ff78398d
Commit Graph

74627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zi Wang
1e692ed087 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 am: ada4983493 am: 894e5ee4c9 am: fcd20e619b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: I683595ddfc363e01c06a27b2d88e3a4de81f72ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 07:35:08 +00:00
Zi Wang
fcd20e619b Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 am: ada4983493 am: 894e5ee4c9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: Ibb6f7402d7d74b127e6ed80c1fee1111273b7fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 06:53:09 +00:00
Zi Wang
894e5ee4c9 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 am: ada4983493 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: I5135ef9ada4e3d6a4bfe104c90b6ffd3d7fe5d02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 05:57:39 +00:00
Zi Wang
ada4983493 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main am: 7c5b6d5273 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759538

Change-Id: Ibd96e46776b1a3a038c5fab4bcb7d0d8895a0441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 04:58:36 +00:00
Treehugger Robot
9edfb56e62 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 am: febe41d738 am: be9f6850a7 am: 9660ccbe20 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: If3d2c92f095331db9f1fcb6a55be29a125c145e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 03:54:56 +00:00
Zi Wang
7c5b6d5273 Merge "Pass java_library libs and static_libs to java_*_proto_library" into main 2023-09-23 03:45:48 +00:00
Treehugger Robot
9660ccbe20 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 am: febe41d738 am: be9f6850a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: I2cd9bfd0077bed3eb04389cdc907b4e82c75fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 03:13:26 +00:00
Treehugger Robot
be9f6850a7 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 am: febe41d738 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: I5338f3d74461eaa752ef63eb3e422ae9f4d49771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 02:20:15 +00:00
Treehugger Robot
febe41d738 Merge "Switch bp2build mutator to bottom up" into main am: 11b20b2993 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2760865

Change-Id: Id965f8ee11d2e7c64cc7e085bc902a00ec0daed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 01:20:30 +00:00
Wonsik Kim
2de7350408 Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577 am: 9ca0761342 am: 671f8e5bbb am: 908a18dc57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654

Change-Id: I7be5afaa398ed1da2175a99b73c5fa4cd792eca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 00:17:56 +00:00
Treehugger Robot
11b20b2993 Merge "Switch bp2build mutator to bottom up" into main 2023-09-23 00:05:47 +00:00
Wonsik Kim
908a18dc57 Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577 am: 9ca0761342 am: 671f8e5bbb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654

Change-Id: Iddcbd7b74247112a457ab9cac029be93620157f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 23:36:00 +00:00
Wonsik Kim
671f8e5bbb Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577 am: 9ca0761342 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654

Change-Id: I170d87a9861a2a168d171d92d1e668b37da391e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 22:44:11 +00:00
Wonsik Kim
9ca0761342 Merge "Add libcodec2_aidl into allowlist" into main am: ee03e4e577 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734654

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

Change-Id: I72f81d531a7f568b6e4676235fb796e99c136652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 22:31:05 +00:00
Wonsik Kim
ee03e4e577 Merge "Add libcodec2_aidl into allowlist" into main 2023-09-22 22:12:33 +00:00
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
0f2ec1c470 Merge changes I620cfd7b,I8ed1919a into main am: eba2a2af22 am: 69a7b4dbb4 am: 4934d3d722 am: 95683f7449 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758566

Change-Id: I54f8dbd8096f9712e7cdc5bbc97b4d84c6a64c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 19:51:13 +00:00
Chris Parsons
6666d0f6b1 Switch bp2build mutator to bottom up 
This should be no-op, as the underlying mutator has not changed yet.

Some other refactoring is required and done in this CL:

- Delete some old, dead ApiBp2build code
- Fix casting to TopDownMutator when it's not necessary

This change is required to prepare for allowlist v2 work, as only
BottomUp mutators can AddDependency.

Bug: 285631638
Test: m nothing
Test: presubmits
Change-Id: I5212a5f5634cc13056195783e6df37ff8eb000da
 2023-09-22 19:19:22 +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
Zi Wang
4dbd0e8688 Pass java_library libs and static_libs to java_*_proto_library 
If a java_library module has proto srcs, a java_*_proto_library target
will be created for it. Proto sources are generated and then compiled
by a java_library target. We need to pass the libs and static_libs of
the java_library module to this java_library target so that
the compile-time classpath is correct.

Test: updated unit tests and CI

Bug: 301469542
Change-Id: I05b2efce6fda2223e85728b3c4c7b1815d04c3dd
 2023-09-22 11:20:06 -07: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
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
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
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
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
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
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