StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,840 Commits 1 Branch 0 Tags
33cbf2d461258c5ca67c4c78d4e5e63cb8155c19
Commit Graph

6628 Commits

Author SHA1 Message Date
Alix
33cbf2d461 resource_strip_prefix support for kotlin srcs am: 4d56abf937 am: 9ba68b0ba3 am: 6722869b6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470480

Change-Id: I5421779dd471cfc592b75fe418bb9fd2f0cca903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:44:01 +00:00
Jiakai Zhang
da72c03f76 Merge "Revert "Generate a boot image extension for mainline BCP jars."" am: fe7755802e am: c2a7ec3783 am: aba25ecccb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466300

Change-Id: I53574a5a0ea6a78fb1881a33cc89a0c215f38d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:01:59 +00:00
Alix
9ba68b0ba3 resource_strip_prefix support for kotlin srcs am: 4d56abf937 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470480

Change-Id: I1067269852d77b2ed53550840eeb7daa98a92560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:05:08 +00:00
Jiakai Zhang
fe7755802e Merge "Revert "Generate a boot image extension for mainline BCP jars."" 2023-03-06 09:53:03 +00:00
Alix
4d56abf937 resource_strip_prefix support for kotlin srcs 
change load locations for kt_jvm_library to be the macro

Change-Id: Id50fcb1f880013fe57647a065cd6b7149d7c5d91
Test: built kotlinx_coroutines locally and compared jar file to soong
Bug: 268519061
 2023-03-03 19:38:28 +00:00
Sorin Basca
b3d25fa6c4 Emit record annotation am: cc9eee0af2 am: 6c6881421c am: 73a467bac2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2215047

Change-Id: I3796eb009de9f9ff3204f30524f4db1380017e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:07:50 +00:00
Treehugger Robot
7d47720f07 Merge "Zip lint reference baselines" am: 831e50f4ca am: 82149acb28 am: d3a161d8ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2468261

Change-Id: I98b9ca700f71cc5d35ef136b5dc6180af2fde0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:04:28 +00:00
Sorin Basca
6c6881421c Emit record annotation am: cc9eee0af2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2215047

Change-Id: I17231e52a5f498f3f1741aea2fafb7c1ba1be26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:42:33 +00:00
Sorin Basca
93bca1585e Merge changes from topic "java17-record-support" 
* changes:
  Allow java.lang.runtime in boot image
  Emit record annotation
 2023-03-03 15:12:28 +00:00
Cole Faust
df38f7ac45 Zip lint reference baselines 
To make them easier to work with.

Bug: 268261262
Test: m lint-check
Change-Id: I42c69d5dd1dc74e1f1963cf72b00b8ee4d608e2a
 2023-03-02 17:23:27 -08:00
Jiakai Zhang
db160c078e Revert "Generate a boot image extension for mainline BCP jars." 
This reverts commit 3830308fb8.

Reason for revert: Caused various SH regressions.

Bug: 271036161
Change-Id: Ia785324f83006a095e262c251b24d49fd778427e
 2023-03-02 13:01:59 +00:00
Spandan Das
f2aa409c01 Merge "Support two active sdks in EffectiveVersionString" am: 364c90773e am: 62f1bbd288 am: ae1eb7135a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464074

Change-Id: Ia6b81459a97ab1cd73b70ef9c1284c99bfc6cb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 02:55:11 +00:00
Spandan Das
364c90773e Merge "Support two active sdks in EffectiveVersionString" 2023-03-02 00:52:12 +00:00
Treehugger Robot
50bdcafb90 Merge "Remove OWNERS access for non-build team people to core build system" am: 8c41eca698 am: 6e8d362f83 am: 870b563ca7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462613

Change-Id: Ifdf3b5e89f575a927e66a8773206a1ec2482c68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 21:27:59 +00:00
Cole Faust
52cb64fbb2 Merge "Give lint the correct api levels database for the current module" am: 917eb06be3 am: f84099023b am: 82a5576d48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412734

Change-Id: I2c0938bfeb1cc913a9b8e748ca97d4ec0ea6a2e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 21:25:35 +00:00
Spandan Das
ffb31afdac Support two active sdks in EffectiveVersionString 
Currently it would return the default one even if the requested one is
an active sdk.

Bug: 270609292
Test: go test ./java
Test: built `rkpdapp` locally in internal and verified that its
targetSdkVersion is U and V
Test: TH

Change-Id: Idb03ff4786ff87fb7911bf31205941618a662404
 2023-03-01 20:11:21 +00:00
Jihoon Kang
8d66f7d693 Merge "Rename output stubs jar file in java_api_library" am: ece6a80b08 am: 43c72c157a am: f8fc1d254e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462253

Change-Id: I33e68ae4bc14bdcd608ce4ca3f78a00fe4d8c335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:09:17 +00:00
Sorin Basca
74a8cbc95b Merge "Revert "Revert "Switch to use new Doclava""" am: a05f0437fe am: 3d693ce4b4 am: 4946415c5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2463154

Change-Id: I0f462686485bbce573c15e33810579dd24ccfde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:55:37 +00:00
Treehugger Robot
8c41eca698 Merge "Remove OWNERS access for non-build team people to core build system" 2023-03-01 19:45:38 +00:00
Cole Faust
917eb06be3 Merge "Give lint the correct api levels database for the current module" 2023-03-01 18:59:05 +00:00
Jihoon Kang
ece6a80b08 Merge "Rename output stubs jar file in java_api_library" 2023-03-01 17:18:53 +00:00
Sorin Basca
a05f0437fe Merge "Revert "Revert "Switch to use new Doclava""" 2023-03-01 17:15:25 +00:00
Sorin Basca
ae995aeef4 Revert "Revert "Switch to use new Doclava"" 
This reverts commit 32db73188d.

Reason for revert: Failing branches now have the updated Doclava (automerger encountered a conflict which led to build failure). Relanding.

Change-Id: Ib327e54898e97a93dd6140a65f2d7231ffd4cef3
 2023-03-01 08:47:42 +00:00
Sorin Basca
790574484a Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 am: 8fcec519ff am: a98b719472 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2438064

Change-Id: Ia819bceff5218c94e94845f6db7846fa810b1883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 08:23:12 +00:00
Treehugger Robot
d7c3eb61d8 Merge "Replace SortedStringKeys with SortedKeys" am: 0f0d3ce49c am: 631ad00a41 am: 155ae26780 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462193

Change-Id: I9e1a9be24bee47ba43d3807ac90efa786dc1b4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 06:31:57 +00:00
Sorin Basca
b0dc477ef7 Merge "Reland^2 "Target Java 17"" 2023-03-01 06:20:20 +00:00
Cole Faust
69861aa57f Give lint the correct api levels database for the current module 
Before this change, lint was always working off of the public
api database. Now, it will have the system, module-lib, or
system-server databases if the current module is compiling
against those SDKs.

This means that a lot more methods are going to start being
checked for NewApi issues.

Bug: 193460475
Test: Errorprone presubmit
Change-Id: I3eb2c617cd61554cd2a3f9d15fd40b3ec91f961d
 2023-02-28 21:18:17 -08:00
Joe Onorato
442b6fc701 Remove OWNERS access for non-build team people to core build system 
Test: treehugger
Change-Id: I0c318ddd7d78110327bbd849ed9aa3973c86de5d
 2023-02-28 19:29:47 -08:00
Cole Faust
8bdc343dba Merge "Disable strict_updatability_linting" am: 20eed826fd am: e9e590670f am: 5080e5d56b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458068

Change-Id: I82ab54acdd3809dd73f9efbf9007af013fea6645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 03:06:00 +00:00
Jihoon Kang
25857f5f42 Rename output stubs jar file in java_api_library 
When generating framework.aidl, `android_*_stubs_current` are converted
to .aidl files (and created as targets) by replacing the extension from
`.jar` to `.aidl`.
Thus, when replacing `android_*_stubs_current` to java_api_library
modules, generating `android.jar` files leads to ninja error(multiple
rules for generating */android.aidl error).
Prevent this error by renaming the name of the artifact jar file as the
module name so that distinct-named ninja targets can be created.

Test: m
Change-Id: Iaa7248996d7bf5e7f98e1d1e2919870c3cccf5a6
 2023-03-01 01:11:18 +00:00
Cole Faust
18994c73f1 Replace SortedStringKeys with SortedKeys 
Now that we have generics.

Bug: 193460475
Test: presubmits
Change-Id: I1594fd8feb505175d5c09c03ef397e5ffd5b09cb
 2023-02-28 16:51:32 -08:00
Cole Faust
20eed826fd Merge "Disable strict_updatability_linting" 2023-02-28 23:53:51 +00:00
Treehugger Robot
a185f414b4 Merge "Omit "--compiler-filter" if the profile is disabled." am: 15e6b1240e am: 1decfa2cbc am: 6260dec22f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460212

Change-Id: Ie33aa9599cf0e9ac77562a7f17985bb601f8bf94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 22:04:40 +00:00
Spandan Das
b6761ee2ae Merge "Update usages of min_sdk_version that relies on (kind+level)" am: c8054ec6ac am: 812fc6cc23 am: f5251b022e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2457061

Change-Id: I1f922888f8f65ce23a8ceb7f7d599f413082963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 22:02:36 +00:00
Cole Faust
1021ccda6b Disable strict_updatability_linting 
strict_updatability_linting currently only makes it so
that NewApi can't be added to the lint baseline.
However, since we're updating NewApi to work on a lot
more apis than before, we need to baseline many issues
across the android tree. Temporarily disable
strict_updatability_linting so that we can add these
baselines.

Bug: 193460475
Test: Presubmits
Change-Id: I8d92df95a46e9b903f0cc0e3be56f17722c50430
 2023-02-28 11:31:15 -08:00
Treehugger Robot
15e6b1240e Merge "Omit "--compiler-filter" if the profile is disabled." 2023-02-28 18:53:44 +00:00
Spandan Das
c8054ec6ac Merge "Update usages of min_sdk_version that relies on (kind+level)" 2023-02-28 16:44:53 +00:00
Jiakai Zhang
63086d7af0 Omit "--compiler-filter" if the profile is disabled. 
This fixes the Golem regression caused by aosp/2453067. On Golem, the
profile disabled and dex2oat uses the default "speed" compiler filter.

Bug: 269230245
Test: art/tools/golem/build-target.sh --machine-type=android-armv8 --golem=art-interpreter
Change-Id: I4fc0dbf9eac8839f7bacd264ddab177956ddd58e
 2023-02-28 15:37:31 +00:00
Sorin Basca
4b7078a4ad Merge "Revert "Switch to use new Doclava"" am: 29b20ea4a8 am: deac31ef48 am: 0a2ac88919 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458512

Change-Id: I9b9e4831b5a430488f84de033916b718078606e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 22:16:35 +00:00
Spandan Das
cadd83c0b8 Merge "Update usages of min_sdk_version that relies on (kind+level)" am: 0cd201c6b5 am: e35fbea7f4 am: 9009d33398 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374713

Change-Id: Ice8cf694c99286e43f1d81d889522e351150c801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 22:14:05 +00:00
Spandan Das
9ac2036d39 Merge "Add documentation for target-sdk-version flag" am: 26cfa5c70d am: b2663e3967 am: bcae4c2346 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453071

Change-Id: I145b4d4354c8c1e25e2c6b400262b6c44fc72775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 22:10:16 +00:00
Sorin Basca
29b20ea4a8 Merge "Revert "Switch to use new Doclava"" 2023-02-27 20:41:03 +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
Sorin Basca
ddbc31a13b Merge "Switch to use new Doclava" am: 6cf6f8032e am: d4b12683f5 am: 5e0e2e4769 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2451006

Change-Id: I10dca135445f1b860912e4cad9166ce2fa94c72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 19:09:37 +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
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
Jiakai Zhang
f597bfd208 Merge changes from topic "boot-image-mainline" am: 4709929c76 am: f96fd09cac am: a75c4af0f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434294

Change-Id: Iebb979ca29b8b6fbce7e5d981dfaddf0949dfc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 16:22:33 +00: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