Commit Graph

6598 Commits

Author SHA1 Message Date
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
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
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
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
Jiakai Zhang
e700c811f7 Merge "Add a new option compilerFilter to bootImageConfig." am: 5fba88bbd6 am: 0cede10365 am: e3eb6117b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453067

Change-Id: I474f0b0151b29f41879f86af7f7a2d31284307fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 21:59:14 +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
Treehugger Robot
467ad6c228 Merge "Revert "Revert "R8/D8 should use sdk_version prop to determine API surface stability.""" am: de1d5bc90c am: 0f03b25ba5 am: 962f77aec3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2452286

Change-Id: I8709d90c9e65dd07a8d5a62f7ef597497ea28c71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 02:08:05 +00:00
Alix Espino
e87015ded2 Merge "temporary unblock for builds using sdkSystem" am: 8393a0fcdc am: c14ab51f39 am: c23361a187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2448142

Change-Id: I328ade676de530c6f1ac9cc722d4791c13f0b039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 02:05:38 +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
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
Sorin Basca
702fb3bdc9 Switch to use new Doclava
Bug: 260694901
Test: m sdk
Change-Id: I0b7331eeca3d3e66a87ddd5c3ebf6b4debbafc22
2023-02-22 19:32:48 +00:00
Alix
79f853d7b9 temporary unblock for builds using sdkSystem
Bug: 215230098
Change-Id: I521342c676f3362d3e1db0aab7924a04602525e1
Test:  built captiveportal-lib and inspected BUILD file
2023-02-21 17:01:16 +00:00
Treehugger Robot
c9201f172b Merge changes I55a5a295,I9c09451d,I05177388 am: c004bf3b7e am: 766f6ac1c3 am: a78d49303f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2426452

Change-Id: I9b02faeffca703d7806640b3ccba7c2ba9a0a047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 16:41:48 +00:00
Treehugger Robot
c004bf3b7e Merge changes I55a5a295,I9c09451d,I05177388
* changes:
  Use the profiles in the APEX to dexpreopt system server jars.
  Add tests for the ignored "profile_guided: true" property.
  Output dex_preopt to SDK snapshot.
2023-02-16 14:46:19 +00:00
Jiakai Zhang
81e468171f Use the profiles in the APEX to dexpreopt system server jars.
After this change, if "profile_guided: true" is set, profile-guided
compilation will be enabled for the jar and the ".prof" file next to
the jar in the APEX ("javalib/<name>.jar.prof") will be used as the
profile when dexpreopting for the prebuilt APEX.

Bug: 241823638
Test: m nothing
Test: -
  1. (on internal master) Patch aosp/2426453.
  2. Build the APEX bundle and the module SDK of com.android.wifi
  3. (on tm-dev) Patch this CL and aosp/2141972.
  4. Copy the APEX bundle and the module SDK built on step 2 to the
     source tree
  5. Disable hiddenapi check
  6. lunch cf_x86_64_phone-userdebug && m MODULE_BUILD_FROM_SOURCE=false com.google.android.wifi
  7. cat out/soong/.intermediates/prebuilts/module_sdk/Wifi/current/prebuilt_service-wifi/android_common_com.android.wifi/dexpreopt/oat/x86_64/javalib.invocation
  8. See the profile being used.
Change-Id: I55a5a295e9c5d6f0564afb139c5fb7da91ab8cae
2023-02-15 22:47:24 +00:00
Jiakai Zhang
9c4dc19f4e Output dex_preopt to SDK snapshot.
This is needed to determine whether we need to deapex the profile or
not.

Bug: 241823638
Test: m nothing
Test: -
  1. Patch ag/20582608 PS2.
  2. TARGET_BUILD_APPS=com.android.wifi packages/modules/common/build/mainline_modules_sdks.sh
  3. See the `dex_preopt` property being written.
Change-Id: I05177388c24be1ab315247ea85e7e3a8600cebd3
2023-02-15 22:47:23 +00:00
Jihoon Kang
3a91c02209 Merge "Add static_libs property in java_api_library soong module" am: 61e09756c2 am: f2deb3cb1f am: 41ea80e148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2436213

Change-Id: I29b765c90496313973f3744885f7bd48253f3052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:38:37 +00:00
Jihoon Kang
61e09756c2 Merge "Add static_libs property in java_api_library soong module" 2023-02-15 17:48:00 +00:00
Cole Faust
e1ef79f030 Merge "Convert RuleBuilder to static rule in buildRuleToGenerateIndex" am: 7ae8afc115 am: b1706744f3 am: 41bda3ee00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2436674

Change-Id: I83e4f2a298d14df68618b8be4ebd40189960b16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 10:08:47 +00:00
Cole Faust
7ae8afc115 Merge "Convert RuleBuilder to static rule in buildRuleToGenerateIndex" 2023-02-15 07:27:31 +00:00
Zi Wang
7f5bea9842 Merge "Add limited bp2build converter of java_sdk_library" am: c451830446 am: 2da9f46ee8 am: 0d2eba6910
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411046

Change-Id: Ic0652f224b85b77cd43fa91efbfc34168299dd7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 05:17:50 +00:00
Zi Wang
c451830446 Merge "Add limited bp2build converter of java_sdk_library" 2023-02-15 02:32:48 +00:00
Cole Faust
a5f64f0396 Convert RuleBuilder to static rule in buildRuleToGenerateIndex
This saves ~34kb from the build.ninja file.

Test: Presubmits
Change-Id: I8fa4974e4f1509be7938c774e536d15a63534753
2023-02-14 17:50:31 -08:00
Yike Zhang
17b39718e8 Merge "Set test config of Robolectric tests to LOCAL_FULL_TEST_CONFIG" am: bbfe9480be am: 1a6ec80b34 am: 75e9588d8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434852

Change-Id: I377644d0269ddee6d9938b91f6c5710987c9c555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 01:32:03 +00:00
Julien Desprez
e6267b68b8 Merge "Revert "Reland "Target Java 17""" am: 4d3f11ccb3 am: 212860594e am: 29b58a6dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435953

Change-Id: Ic589a5de90db628f9f5a35d12518dcc19df1694c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 01:31:46 +00:00
Jihoon Kang
e30fff0b5c Add static_libs property in java_api_library soong module
Package private stub annotations are not part of any API surfaces, but
are included in the `android_<API_SURFACE_NAME>_stubs_current`. Since
these cannot be included in the java_api_library by api_contributions,
add static_libs property to statically include jars in the output jar
file.

Test: m
Change-Id: Icb4401f29079ba32df4c192943a7e8814599d9ba
2023-02-15 00:27:18 +00:00
Yike Zhang
bbfe9480be Merge "Set test config of Robolectric tests to LOCAL_FULL_TEST_CONFIG" 2023-02-14 23:30:39 +00:00