Treehugger Robot
b95a8b33be
Merge "Enable/disable optimize for android_test and android_test_helper_app by default." into main
2023-09-25 17:51:14 +00:00
Cole Faust
71aa535721
Merge "Emit a system image target for the current product" into main
2023-09-25 17:08:34 +00:00
Jingwen Chen
65229207d1
Enable/disable optimize for android_test and android_test_helper_app by default.
...
Follow up to https://android-review.git.corp.google.com/c/platform/build/bazel/+/2727853/comment/f2c5802e_245fd302/
Test: New unit tests, presubmits
Test: `atest-dev HelloWorldTests --roboleaf-mode=dev`
Change-Id: I88efcf72fbcb717d05e71ba50ba7802c3bece816
2023-09-25 15:27:33 +00:00
Usta (Tsering) Shrestha
ed0163ec88
Merge "Include label in aquery error" into main
2023-09-25 15:09:31 +00:00
Colin Cross
40c7bae1df
Merge changes from topics "revert-2629131-sandbox-rust-inputs-JRFPQTIPEY", "revert-2758566-WBNIADIEXA" into main
...
* changes:
Revert^3 "add rust_toolchain_rustc_prebuilt module type"
Revert^3 "add crate_root property to rust modules"
Revert^3 "allow Ninja variables in RuleBuilder API"
Revert "conditionally escape rule builder command"
Revert "support sandboxed rust rules"
Revert "fix failing rust_aconfig_library test"
Revert "rustSetToolchainSource to use linux-x86 srcs"
Revert "remove rust deps on clang prebuilts"
2023-09-23 05:19:13 +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
11b20b2993
Merge "Switch bp2build mutator to bottom up" into main
2023-09-23 00:05:47 +00:00
Wonsik Kim
ee03e4e577
Merge "Add libcodec2_aidl into allowlist" into main
2023-09-22 22:12:33 +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
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
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
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
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
c62b27a7ea
Merge "Mark android_* modules with java_resources as unconvertible" into main
2023-09-22 14:56:18 +00:00
Liz Kammer
596ee5c82d
Merge "Do not convert non-unit tests." into main
2023-09-22 14:08:53 +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
9c5b51e4f6
Merge "Remove unused file path" into main
2023-09-22 02:06:54 +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
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
Liz Kammer
80b54d2502
Do not convert non-unit tests.
...
Test: CI
Change-Id: Iab9c134718351187859f34a26bd3a2aa66e009d5
2023-09-21 14:27:42 -04:00
Trevor Radcliffe
44e4102362
Merge "Revert "Block CFI on static libraries"" into main
2023-09-21 18:15:25 +00:00
Treehugger Robot
a56002a473
Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main
2023-09-21 17:56:35 +00:00
Yu Liu
62f7302701
Merge "Convert cc_aconfig_library to bazel." into main
2023-09-21 17:43:07 +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
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
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
Jingwen Chen
72e22018c3
Merge "bp2build converter for android_test_helper_app." into main
2023-09-21 15:09:06 +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
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