tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
72022 commits 1 branch 0 tags 115 MiB
Commit graph

72022 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ray Chin
4ad574cc37 Merge "Fix read file error in extract_apks" into main 2023-09-23 04:09:18 +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
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
Treehugger Robot
11b20b2993 Merge "Switch bp2build mutator to bottom up" into main 2023-09-23 00:05:47 +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
Wonsik Kim
ee03e4e577 Merge "Add libcodec2_aidl into allowlist" into main 2023-09-22 22:12:33 +00:00
Wen-yi Chu
9c64274b27 Revert^3 "add crate_root property to rust modules" 
60375c4adf

Change-Id: I356e936139592893a47d4c6b9e747f24470b11f9
 2023-09-22 22:05:54 +00:00
Wen-yi Chu
789a7e0883 Revert^3 "allow Ninja variables in RuleBuilder API" 
0e2d63e4d2

Change-Id: I4a22fb398fc7bfdf86613829dfbc9c35fab11ee7
 2023-09-22 22:05:54 +00:00
Wen-yi Chu
53ed08aec0 Revert "conditionally escape rule builder command" 
Revert submission 2629131-sandbox-rust-inputs

Reason for revert: Fail on android build.

Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs

Change-Id: I0d70fb9bbb9597d5fa68e764cdcf57f1a0333037
 2023-09-22 22:05:54 +00:00
Wen-yi Chu
41326c1f41 Revert "support sandboxed rust rules" 
Revert submission 2629131-sandbox-rust-inputs

Reason for revert: Fail on android build.

Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs

Change-Id: Ifd9aa46e80a12d8f4ffa0a2daa74b96727cbb7e6
 2023-09-22 22:05:54 +00:00
Wen-yi Chu
930fd8bfb1 Revert^3 "add rust_toolchain_rustc_prebuilt module type" 
9333ac1249

Change-Id: Ic7f064806553a0cfbc286136a764b5ea3898d06c
 2023-09-22 22:05:54 +00:00
Colin Cross
df0ed707a5 Revert "fix failing rust_aconfig_library test" 
This reverts commit 521eb20dc2.

Reason for revert: b/301463284

Change-Id: I45f4793694654f3afd2dee6188e0bf58cfb48992
 2023-09-22 22:05:39 +00:00
Colin Cross
7ba7e8232b Revert "rustSetToolchainSource to use linux-x86 srcs" 
Revert submission 2758566

Reason for revert: b/301463284

Reverted changes: /q/submissionid:2758566

Change-Id: Ia4966732e9bec105c854f09aa0523329ef4d8fd0
 2023-09-22 22:02:28 +00:00
Colin Cross
05cbcb3539 Revert "remove rust deps on clang prebuilts" 
Revert submission 2758566

Reason for revert: b/301463284

Reverted changes: /q/submissionid:2758566

Change-Id: I54f0ecbbd922deb23009ca89ff79689e128f4f31
 2023-09-22 22:02:28 +00:00
Cole Faust
cb193ec471 Emit a system image target for the current product 
This system image can be built with bazel instead of make.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: I5fd61a28f664d8310435c3b7e5dbdd89a7ec6159
 2023-09-22 14:42:33 -07:00
usta
a79afd7efa Include label in aquery error 
When an Action fails to convert to a Ninja build statement,
include the bazel label in the error message.

Test: NA
Bug: 301638491
Change-Id: I592978c5e530043769b0232fdd200ad13b72c39b
 2023-09-22 17:31:32 -04: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
Romain Jobredeaux
afc5d27ab0 Do not convert android_library_import with no aars. 
Bug: 301007952
Change-Id: Ia32d47eeb1a888ea2555d5ca08f56f191c040bc7
 2023-09-22 15:52:59 -04: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
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
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
Jihoon Kang
a96a7b1e13 Remove naming conventioned based file sorting in java_api_library 
With api_files property being removed from java_api_library, all api
files are passed to java_api_library via java_api_contribution, which
provide api_surface information. Instead of relying on the naming
convention of the api files, java_api_library can utilize this
information to sort the api files from narrower api scope to the wider
api scope.

Test: m --build-from-text-stub
Bug: 295429988
Change-Id: Idd832778833c072c6b7e9d1f775533e5f4e2af00
 2023-09-22 16:55:43 +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
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
Mark White
a1c9bb08b5 Added new framework-pdf jar inside MediaProvider module 
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Ib5294ef9d1c632777af0ca9225d459cbc188e589
 2023-09-22 13:28:51 +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
Ray Chin
0523ee828a Fix read file error in extract_apks 
Bug: 301409551
Test: build
Change-Id: I353efea233e524c838298447b08743eeeedbb263
 2023-09-22 13:20:50 +08: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
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
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
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
Jihoon Kang
6be0f00671 Remove api_files property from java_api_library 
java_api_contribution provides api_surface information, but files
directly passed to java_api_library do not possess such information.
Currently, the api surface is assumed via naming convention for api
files passed via api_files property, but this is fragile.

This change removes the api_files property from java_api_library and
enforce all api files to be passed via java_api_contribution

Test: m nothing --build-from-text-stub
Bug: 300964421
Change-Id: If01d9ed978fe469d4ee0d685582a51629ebecc56
 2023-09-21 21:02:39 +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
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