StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,011 Commits 1 Branch 0 Tags
4f5660941b51a16900de5cb7d7cbe0735e104d21
Commit Graph

64011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spandan Das
b2663e3967 Merge "Add documentation for target-sdk-version flag" am: 26cfa5c70d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453071

Change-Id: Ic5ded367e5781e93244d0d4316ac043b4ad12c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 20:36:29 +00:00
Sorin Basca
32db73188d Revert "Switch to use new Doclava" 
This reverts commit 702fb3bdc9.

Reason for revert: Build breaks in some branches

Change-Id: I3502b86d1a2e1afd6bc32e02287cd903bad7b9b2
 2023-02-27 20:34:18 +00:00
Spandan Das
7fa982c0ec Update usages of min_sdk_version that relies on (kind+level) 
The type of min_sdk_version is being migrated from
android.SdkSpec(kind+level) to android.ApiLevel(level). This affects
`ShouldSupportSdkVersion` for java modules. This function skips the
check for modules compiling against `core`, and that requires access to
SdkVersion and not MinSdkVersion after the migration.

Skip the check explicitly using SdkVersion.

Test: go test ./java
Test: No change in ninja file
Bug: 208456999
Change-Id: I14eca4f8e8c5d7477ded00c4fe54097323fab4a2
 2023-02-27 20:03:25 +00:00
Yu Liu
ec992247d1 Merge "Add a test to compare the DCLA libs across the apexes." 2023-02-27 19:13:52 +00:00
Spandan Das
0cd201c6b5 Merge "Update usages of min_sdk_version that relies on (kind+level)" 2023-02-27 18:39:11 +00:00
Sorin Basca
5e0e2e4769 Merge "Switch to use new Doclava" am: 6cf6f8032e am: d4b12683f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2451006

Change-Id: Iaca50ab98a85b6ca1419532f4a79c3305c95dacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 18:33:52 +00:00
Sorin Basca
d4b12683f5 Merge "Switch to use new Doclava" am: 6cf6f8032e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2451006

Change-Id: I106ccbad6d2528e5066cf4518c0fe790accae1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 18:00:53 +00:00
Spandan Das
26cfa5c70d Merge "Add documentation for target-sdk-version flag" 2023-02-27 17:49:33 +00:00
Sorin Basca
6cf6f8032e Merge "Switch to use new Doclava" 2023-02-27 16:53:45 +00:00
Alix Espino
38d780a342 Merge "Revert^2 "refactor of api_levels map for soong injection"" am: 0897df1466 am: c8420f4814 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2456128

Change-Id: Ic963b14eb54533d85b70bd7c7c1e96016bf889d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 15:44:04 +00:00
Jiakai Zhang
a75c4af0f1 Merge changes from topic "boot-image-mainline" am: 4709929c76 am: f96fd09cac 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434294

Change-Id: Ife1f101352936f0f5cef093356afbff85ccc4cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 15:40:54 +00:00
Alix Espino
c8420f4814 Merge "Revert^2 "refactor of api_levels map for soong injection"" am: 0897df1466 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2456128

Change-Id: I0e8406a1c7d5c2c4597b55fd4bcfec0ab9e336ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 15:05:11 +00:00
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
Alix Espino
0897df1466 Merge "Revert^2 "refactor of api_levels map for soong injection"" 2023-02-27 14:10:44 +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
eaf1915420 Merge "Prevent sdk variants from install" am: 8ecedd4dfc am: 1fc2e078a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2445946

Change-Id: I45edbcd30994e30c4caa4304bd89e1b012e63762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 04:26:18 +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
Yu Liu
e0c4d35cc5 Add a test to compare the DCLA libs across the apexes. 
Bug: 268337606
Test: manual run it.
Change-Id: I48525ed4724736594080af757800f0e224852abd
 2023-02-25 14:02:36 -08:00
Chris Wailes
616417e9a5 Merge "rustc-1.67.1 Build 9645761" am: 2760e81c82 am: 28d48a87c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453805

Change-Id: I00e59c7ad731c096a2a6ab00de82d0e336ed2d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:39:45 +00:00
Matthew Maurer
f08e9ed7d2 rust: Set android_vendor and android_product cfg am: 65a54a8e3d am: dfe3f37965 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454211

Change-Id: I52d00c1107cc8ce50e2c2799f1592c6789bc7785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:39:29 +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
6d12db423c Disallow the use of new unstable features 
This CL adds a set of allowed unstable featuers for Rust code.  The goal
is to get this down to an empty list.

Bug: 267698452
Test: m rust
Change-Id: I09e61bf19594101f064bdf67dc81c3b4d1236266
 2023-02-24 16:58:18 -08:00
Spandan Das
50885c0524 Update usages of min_sdk_version that relies on (kind+level) 
The type of min_sdk_version is being migrated from
android.SdkSpec(kind+level) to android.ApiLevel(level). This affects the
{min|target}-sdk-version aapt2 flag for vendor modules. For these
modules, if min_sdk_version is not set in Android.bp files,
MinSdkVersion would default to SdkVersion, and therefore would get
access to the sdkKind it was compiling against.

To accomodate the upcoming change of min_sdk_version to ApiLevel,
explicitly use SdkVersion to determine the `min-sdk-version` flags for
modules targeting `current`.

Bug: 208456999
Test: no change in ninja files (this should be a noop)
Change-Id: Ie2924698687597cdd572d4bb4c687d0b1569c4b8
 2023-02-25 00:24:02 +00:00
Spandan Das
6450b555b5 Add documentation for target-sdk-version flag 
This is using min_sdk_version and not target_sdk_version value from
Android.bp. Add documentation on why it has been implemented as such.

Test: N/A
Change-Id: I7da38ed351562dc530cde4c0d6bf7bd6b691f01d
 2023-02-25 00:04:45 +00:00
Chris Wailes
2760e81c82 Merge "rustc-1.67.1 Build 9645761" 2023-02-24 23:12:10 +00:00
Jiakai Zhang
e3eb6117b6 Merge "Add a new option compilerFilter to bootImageConfig." am: 5fba88bbd6 am: 0cede10365 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453067

Change-Id: Ibe3108ac16511125bb25ced1705989afb811380f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 21:05:36 +00:00
Anton Hansson
0da8402b62 Merge "Make rros not overridable" am: 2ae1bbb599 am: 9940db4c91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2455446

Change-Id: I55429e292f04a58fe10353dbeb7147ce0cc899eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 21:05:12 +00:00
Anton Hansson
d73f53576f Merge "Revert "Support overriding APEX java contents"" am: 44b3e7565a am: 640019400a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2455447

Change-Id: Iad33bb7d0233270cdd4c8d44285e9c07153c5867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 21:04:04 +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
Alix Espino
4fd7e74140 Revert^2 "refactor of api_levels map for soong injection" 
a865f4e905

Change-Id: Ifea020ac83725df7131773ca587c56931f5cdf03
 2023-02-24 14:46:43 +00:00
Matthias Männich
7cbc363620 Merge "Revert "refactor of api_levels map for soong injection"" am: 199584223a am: cd45342fb0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453188

Change-Id: I0f9f12f96087a23177167f39af6797196f266fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 14:43:09 +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
9c70293ecd Merge "Add information about what module produced a certain androidmk entry" am: 50ffead8fe am: 9bdba901bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454749

Change-Id: I18e33da658139381423be8d9776666f0cb11290f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:58:30 +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
d8838ad1fb Merge "Don't link bionicDeps for noStdlibs bindgen." am: 28f6442674 am: 71f3b7673f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453070

Change-Id: I2c810d800a3acae52772bad6154acd7a4dc1a047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:46:22 +00:00