Jiakai Zhang
f96fd09cac
Merge changes from topic "boot-image-mainline" am: 4709929c76
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434294
Change-Id: Ieaed1e117a7e317f93c6050aec823068b319029e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 15:04:00 +00:00
Jiakai Zhang
4709929c76
Merge changes from topic "boot-image-mainline"
...
* changes:
Generate a boot image extension for mainline BCP jars.
Refactor platform_bootclasspath to support multiple boot images.
Refactor dexpreopt for boot jars to allow more complex dependencies.
2023-02-27 12:04:28 +00:00
Jooyung Han
1fc2e078a4
Merge "Prevent sdk variants from install" am: 8ecedd4dfc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2445946
Change-Id: I3a8c761b75b069a06cbababbf032a4aba72b0131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 03:56:26 +00:00
Jooyung Han
8ecedd4dfc
Merge "Prevent sdk variants from install"
2023-02-27 00:41:34 +00:00
Chris Wailes
28d48a87c3
Merge "rustc-1.67.1 Build 9645761" am: 2760e81c82
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453805
Change-Id: Ib4f14489eca8ca6cb943453cc41c77135de9c14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:09:37 +00:00
Matthew Maurer
dfe3f37965
rust: Set android_vendor and android_product cfg am: 65a54a8e3d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454211
Change-Id: If7601ef83f2c716c6d4a6a8c6ab51a1dd05df09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:04:36 +00:00
Chris Wailes
2760e81c82
Merge "rustc-1.67.1 Build 9645761"
2023-02-24 23:12:10 +00:00
Jiakai Zhang
0cede10365
Merge "Add a new option compilerFilter
to bootImageConfig
." am: 5fba88bbd6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453067
Change-Id: I650b93a960b100ffc1da3133fe1988c88c1501b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 20:01:13 +00:00
Anton Hansson
9940db4c91
Merge "Make rros not overridable" am: 2ae1bbb599
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2455446
Change-Id: I002965270d6f89b1b7b520fd7d43add242e1aca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 19:58:33 +00:00
Anton Hansson
640019400a
Merge "Revert "Support overriding APEX java contents"" am: 44b3e7565a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2455447
Change-Id: Iebea8d59acd2931360937db21035f1b385c1ca11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 19:56:15 +00:00
Matthew Maurer
65a54a8e3d
rust: Set android_vendor and android_product cfg
...
Add `android_vendor` and `android_product` cfgs, similar to
__ANDROID_VENDOR__ and __ANDROID_PRODUCT__ defines for C++
Bug: 270718001
Test: m nothing with added test
Change-Id: Ibeabe2983d1454e5a2ec0bb2f43e793b8f32a5c2
2023-02-24 19:21:08 +00:00
Jiakai Zhang
3830308fb8
Generate a boot image extension for mainline BCP jars.
...
Bug: 269230245
Test: m
Test: atest art_standalone_dexpreopt_tests
Change-Id: I253c30d938eee2cf2549ec2338425d53956e7cbb
2023-02-24 17:14:08 +00:00
Jiakai Zhang
d49324dadb
Refactor platform_bootclasspath to support multiple boot images.
...
Bug: 269230245
Test: m
Change-Id: I223756d5481607a82732f70c51057609ec4ee43f
2023-02-24 17:14:08 +00:00
Jiakai Zhang
8fe3a415b5
Refactor dexpreopt for boot jars to allow more complex dependencies.
...
After this change, the dependency hierachy can be arbitrarily deep. For
example, you can have one boot image that extends another boot image
that extends yet another boot image.
Bug: 269230245
Test: m
Change-Id: I096d0b57bda36b982ecc97378647f9c59071a3bf
2023-02-24 17:13:54 +00:00
Jiakai Zhang
5fba88bbd6
Merge "Add a new option compilerFilter
to bootImageConfig
."
2023-02-24 16:41:52 +00:00
Anton Hansson
2ae1bbb599
Merge "Make rros not overridable"
2023-02-24 16:34:24 +00:00
Anton Hansson
44b3e7565a
Merge "Revert "Support overriding APEX java contents""
2023-02-24 14:56:10 +00:00
Matthias Männich
cd45342fb0
Merge "Revert "refactor of api_levels map for soong injection"" am: 199584223a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453188
Change-Id: I41b0dad64ffa195f1fc7e89d508a0ad9976a78f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 13:59:22 +00:00
Anton Hansson
72e7ffe6ad
Make rros not overridable
...
There are no current users of overriding rros, so it's dead code.
Additionally, there is some evidence of accidental misuse, so remove it
for now as we don't want arbitrary properties of AOSP modules to be
overridable in the general case.
Bug: 270542561
Bug: 269568074
Test: presubmit
Change-Id: I030abd644358baefc0d1543649c8a2a81a7491d0
2023-02-24 11:17:05 +00:00
Anton Hansson
e7545858bd
Revert "Support overriding APEX java contents"
...
This reverts commit be90172f0a
.
Reason for revert: not used, and not desired
Bug: 270542561
Test: presubmit
Change-Id: I415440dbae965f3c07c6f3ccf6ab4bc9ec57fbf6
2023-02-24 11:13:00 +00:00
Matthias Männich
199584223a
Merge "Revert "refactor of api_levels map for soong injection""
2023-02-24 09:48:05 +00:00
Treehugger Robot
9bdba901bb
Merge "Add information about what module produced a certain androidmk entry" am: 50ffead8fe
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454749
Change-Id: Ibdd163d260b50b1c6f09537b56d1aa0a6e91b30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 08:29:19 +00:00
Treehugger Robot
50ffead8fe
Merge "Add information about what module produced a certain androidmk entry"
2023-02-24 04:39:39 +00:00
Treehugger Robot
71f3b7673f
Merge "Don't link bionicDeps for noStdlibs bindgen." am: 28f6442674
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453070
Change-Id: I8c6008173735ba5c16afe1cfc439a9173c7269b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 03:00:53 +00:00
Cole Faust
39aabe94b9
Add information about what module produced a certain androidmk entry
...
For easier debugging.
Bug: 254205429
Test: Presubmits
Change-Id: I54fc53dd3b4f32eb3e4458386aa6caa5b76dbb5b
2023-02-23 16:57:43 -08:00
Treehugger Robot
0f03b25ba5
Merge "Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability.""" am: de1d5bc90c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2452286
Change-Id: I7e1d2413e35332ea7d17221761498dbf90c67578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 00:20:53 +00:00
Alix Espino
c14ab51f39
Merge "temporary unblock for builds using sdkSystem" am: 8393a0fcdc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2448142
Change-Id: I41ae22f76c137830f7e25a6b90143e2302108e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 00:14:39 +00:00
Treehugger Robot
28f6442674
Merge "Don't link bionicDeps for noStdlibs bindgen."
2023-02-23 22:41:11 +00:00
Treehugger Robot
de1d5bc90c
Merge "Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability."""
2023-02-23 21:39:49 +00:00
Alix Espino
8393a0fcdc
Merge "temporary unblock for builds using sdkSystem"
2023-02-23 20:47:37 +00:00
Chris Wailes
9744521db2
rustc-1.67.1 Build 9645761
...
Bug: https://issuetracker.google.com/issues/268053615
Test: m rust
Change-Id: Ie4919008285ce72a625676e65555a60160049db8
2023-02-23 11:35:19 -08:00
Dan Albert
30e66dcce5
Don't link bionicDeps for noStdlibs bindgen.
...
Bug: None
Test: treehugger
Change-Id: I213328f038061099d5c0dad0ef22cfd632ed268d
2023-02-23 19:17:50 +00:00
Alix Espino
9ece38f0b5
Merge "refactor of api_levels map for soong injection" am: d3ffe6475e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435772
Change-Id: Ic6780f152dce2be1fd7aac90bb51284ac7237f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 19:13:35 +00:00
Spandan Das
c404cc79e9
Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability.""
...
This reverts commit 7eb9243fa7
.
Reason for revert: The original change was reverted since it was suspected to cause missing libc++.so errors. It was a red herring, and the root cause has been fixed now b/264588525
Change-Id: Ib9110c41bacf220b91f24de11589f63235895e56
2023-02-23 18:05:05 +00:00
Jiakai Zhang
8e9ea8bb83
Add a new option compilerFilter
to bootImageConfig
.
...
After this change, the compiler filter can be specified by the option,
and profiles will not be used if the compiler filter is not
a profile-guided one.
This change also allows preloadedClassesFile to be empty.
Bug: 269230245
Test: m
Change-Id: I65e6b7209d2f0510bcc784a62623ab402b7f96bb
2023-02-23 17:50:46 +00:00
Matthias Männich
a865f4e905
Revert "refactor of api_levels map for soong injection"
...
Revert submission 2441746-api_levels_refactor
Reason for revert: broke Android kernel build tools build: https://ci.android.com/builds/branches/aosp_kernel-build-tools/grid ?
Reverted changes: /q/submissionid:2441746-api_levels_refactor
Change-Id: I35206879b93ec95ae325025cb764c6c34880dccf
2023-02-23 17:10:27 +00:00
Alix Espino
d3ffe6475e
Merge "refactor of api_levels map for soong injection"
2023-02-23 16:35:35 +00:00
Joe Onorato
cd42e6ec18
Merge "Revert "Add an Override_apex_available
property for APEX"" am: 9daa33032c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2449903
Change-Id: I5df22771f354c170697840198b9bd71e4db7cb39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:31:10 +00:00
Joe Onorato
9daa33032c
Merge "Revert "Add an Override_apex_available
property for APEX""
2023-02-23 06:18:39 +00:00
Treehugger Robot
c5a4039995
Merge "Aligning cc_fuzz variable with fuzzer proto" am: 44fdfe5b8f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2429493
Change-Id: Ic6aa8458ad6b6d32433eb103cedc8c074fe0aab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 04:52:22 +00:00
Treehugger Robot
44fdfe5b8f
Merge "Aligning cc_fuzz variable with fuzzer proto"
2023-02-23 03:53:02 +00:00
Yu Liu
6f6abe34d1
Merge "Only apply apex transition to DCLA libs for now." am: 995a3a192f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2449906
Change-Id: Ib7f45430cce41a261afdbc035b48d077c0e23085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 03:42:31 +00:00
Yu Liu
995a3a192f
Merge "Only apply apex transition to DCLA libs for now."
2023-02-23 02:16:19 +00:00
Yu Liu
5c564aa830
Merge "bp2build of libraries with stubs should handle non-implementation deps" am: 89ce6bd127
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2448922
Change-Id: I20d03e368d77e2fa6ebf405f6578bd0e30045a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 01:13:10 +00:00
hamzeh
eea256b2e3
Aligning cc_fuzz variable with fuzzer proto
...
Test: make haiku
Change-Id: I29971cdb043929b87130b4dd7b3c0589ab4b4fee
2023-02-22 16:17:33 -08:00
Yu Liu
89ce6bd127
Merge "bp2build of libraries with stubs should handle non-implementation deps"
2023-02-22 23:35:04 +00:00
Yu Liu
bfb2362cde
Only apply apex transition to DCLA libs for now.
...
Bug: 270339610
Test: mixed_droid.sh
Change-Id: I6a8b7fdefeb504a25256e92647de9b487d5b65a3
2023-02-22 10:43:46 -08:00
Joe Onorato
8bb9a4a194
Revert "Add an Override_apex_available
property for APEX"
...
This reverts commit dd2c76e772
.
Reason for revert: This was submitted without build system team +2 with no rationale for why it's needed.
Change-Id: I86b9849122ec2b7a382d4f39bbbc0ea1ff70c4bc
2023-02-22 17:17:31 +00:00
Iavor-Valentin Iftime
f2952d1e24
Merge "Revert "Revert "Revert "Enable -Wformat-insufficient-args globally"""" am: a1e3a55810
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2450422
Change-Id: I2d21fa27e145dc4f0e44ac7e774fa51b610bb900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 10:30:19 +00:00
Treehugger Robot
ba2ea1d6b3
Merge "Revert "Revert "Enable -Wformat-insufficient-args globally""" am: ee8daaa689
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2449647
Change-Id: Ifb66a59d06a2e6858c82ca1300f96c0d69ddf42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 10:28:18 +00:00