StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,190 Commits 1 Branch 0 Tags
c2599194eeb51a88e1147745ae16ebd3adfb1681
Commit Graph

7926 Commits

Author SHA1 Message Date
Anton Hansson
a6ae274e3b Re-enable the AnnotationExtraction error 
This prevents errors in typedef definitions. Re-enable it.

Ignore-AOSP-First: This error is not being re-enabled in AOSP yet
Bug: 309971481
Test: m checkapi
Change-Id: If9f0e580cda62d0021e82b1831746b3d15d1bfbd
 2023-11-10 16:19:27 +00:00
Anton Hansson
d972a088d9 Re-enable the InvalidNullabilityOverride check 
It's been disabled previously due to pre-existing failures. Baseline
those and remove the disabling.

Ignore-AOSP-First: This error is not being re-enabled in AOSP yet
Bug: 222738070
Test: m checkapi
Change-Id: I3382152186d7d8f63da7c1cc95d3ef962f422642
 2023-11-10 09:57:55 +00:00
Anton Hansson
8de1f48965 Merge "Re-enable the bannedThrow check" into main 2023-11-09 20:50:00 +00:00
Jiakai Zhang
2398442ec0 Change OnlyPreoptBootImageAndSystemServer to OnlyPreoptArtBootImage. 
OnlyPreoptBootImageAndSystemServer was for making the eng build faster.
This change makes it even faster.

Bug: 309011617
Test: Presubmit
Change-Id: If9001e99593b57deafa7b56f0ca6b3d4d80f56d3
 2023-11-09 16:50:58 +00:00
Alyssa Ketpreechasawat
a0cf0a4a66 Skip unknown check in bootclasspath_fragment (source version) if prebuilt version is in use. 
Following aosp/2822531, when MediaProvider prebuilt is enabled, framework-pdf (new jar) will be removed from PRODUCT_APEX_BOOT_JARS. Subsequently there will be an error around the inconsistency (unknown) between bootclasspath_fragment (source version of MP with framework-pdf in its content) and PRODUCT_APEX_BOOT_JARS (framework-pdf removed). Since the source version of bootclasspath_fragment is not in use, we should ignore this check. See more detail in go/stale-mainline-prebuilts (issue from changes in framework/service jars in existing apexes).

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I0f62277a9e65522bf5a4ea1ae33c166f996c37d5
 2023-11-09 12:54:09 +00:00
Anton Hansson
b3a9fcf664 Re-enable the bannedThrow check 
It's been disabled previously due to pre-existing failures. Baseline
those and remove the disabling.

Bug: 222738070
Test: m checkapi
Ignore-AOSP-First: This error is not being re-enabled in AOSP yet
Change-Id: Ia4f91f1470a5bce332df1896b81550276c4b174d
 2023-11-09 10:06:04 +00:00
Spandan Das
e9f86b6b0b Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e am: e48000d86f am: 874d391f63 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: Iea3c3e3ac6b9ae49c2b54bf78831495b19637df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 03:17:22 +00:00
Spandan Das
26da80db09 Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: I5b8b12c7e74c6342807667587d0941a0c366f222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:03:15 +00:00
Spandan Das
e48000d86f Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: Ia7b7a22e9be58e37db8d188eff8cda2a8dc408e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 01:58:15 +00:00
Spandan Das
fc12d2f494 Special-case java_sdk_library in source vs prebuilt selection 
If a java_sdk_library is listed in `contents`, then restrict the source
vs prebuilt selection superseding to only the internal stub libraries.

Defer the source vs prebuilt selection mechanism of the top-level
library to the existing mechanisms for now. This is necessary because
this top-level library acts as a hook for
- hiddenapi: boot jars are deapxed from the prebuilt apex
- dexpreopt: system server jars are deapexed from the prebuilt apex and
  installed via required

If `next` uses `framework-foo` and `service-foo` as the top-level
library instead of the prebuilt equivalents, then the bootjars installed
in out/soong/dexpreopt_x86_64/apex_bootjars will come from source. And
the *.odex files of the system server jars will come from source.

Bug: 308174768
Test: Added a java_sdk_library unit test to assert that the new
mechanism supersedes the `prefer` flag

Change-Id: Ib43198a3b547c58b54f1f0966e95584215096d32
 2023-11-08 18:37:24 +00:00
Jiakai Zhang
77d4619b1b Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: f3c1e6f8fe am: 7dbbbd43ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I437d8e0f093fb79778c82507ba2207d3888e994a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:07:32 +00:00
Anton Hansson
1d9c31c701 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 am: ca3bfaba87 am: b079b4c261 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: If594ee3a8250f12f847f7c8a6c3a407547dd28b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:05:52 +00:00
Jiakai Zhang
b39cf8346f Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I2c25896a1495fb64709dc51f4bd253ed7fc59e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:28:53 +00:00
Jiakai Zhang
f3c1e6f8fe Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I533792e84af2417c260b5f9afcc6387f78eb16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:26:01 +00:00
Jiakai Zhang
04445d5443 Merge "Use the correct mainline BCP jars for app dexpreopt." into main 2023-11-08 10:56:58 +00:00
Anton Hansson
45114303f5 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I4d668824a55df53562943c2066274cdda7c5cbaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 10:52:19 +00:00
Anton Hansson
ca3bfaba87 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I28b3f68058d8f5e4951ef2e845906dbbe873bbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 10:49:28 +00:00
Anton Hansson
d69b5ff1b2 Merge "Stop suppressing the ChangedDefault error" into main 2023-11-08 10:23:42 +00:00
Anton Hansson
971881fcd8 Merge "Add a new flag to stop disabling lint errors" into main am: bf3e32d870 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816560

Change-Id: Ide1642cb3cd7af65d2898fd09ae41afb3f04b0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 16:30:12 +00:00
Anton Hansson
35f97155c7 Merge "Add a new flag to stop disabling lint errors" into main am: bf3e32d870 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816560

Change-Id: Id9090e39d1a9716be323f4689a8678c98bceefe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 16:27:05 +00:00
Anton Hansson
59ef1ec1f5 Stop suppressing the ChangedDefault error 
This will prevent future breakages of this kind, so reenable the check.

Bug: 223382732
Test: m checkapi
Change-Id: I5e67ed45e3a78b90de6884a0d7b0b1c91d58b6f5
 2023-11-07 15:44:14 +00:00
Anton Hansson
8b9661f365 Remove duplicated hidden warning 
HiddenSuperclass is already in disabledWarnings.

Test: presubmit
Change-Id: I0ddd145a7b39d2367b27164fa65266fc0042631c
 2023-11-07 10:19:35 +00:00
Anton Hansson
cfcf7b47c5 Merge "Add a new flag to stop disabling lint errors" into main 2023-11-07 10:18:52 +00:00
Anton Hansson
856cedb2c0 Add a new flag to stop disabling lint errors 
java_sdk_library has historically suppressed a few legitimate lint
errors. Make it possible to remove these suppressions via a flag.

Ignore-AOSP-First: in internal topic, will cp after
Bug: 306806877
Test: checkapi
Change-Id: I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094
 2023-11-07 10:18:23 +00:00
Anton Hansson
fd1c0d2eaa Add a new flag to stop disabling lint errors 
java_sdk_library has historically suppressed a few legitimate lint
errors. Make it possible to remove these suppressions via a flag.

Bug: 306806877
Test: checkapi
Merged-In: I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094
Change-Id: I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094
 2023-11-07 10:14:50 +00:00
Zi Wang
e1166f081f Use ApiLevel on min, target and compile Sdk version 
This change is a partial revert of aosp/2143082. The reason is
that unreleased apis should be referenced by name instead of a
number.

link to xml reports before/after this cl:
https://drive.google.com/drive/folders/1woIgVlHF6qude5RpW-0mEQLzcXo4isX4?usp=sharing

Test: m lint-check
Change-Id: I6d801f95a24400c9c5c23546e19d6440bd357873
 2023-11-06 13:59:07 -08:00
Jeff Sharkey
5423fe8dc6 Merge "Fix tests that are broken on darwin builds." into main 2023-11-06 21:40:37 +00:00
Jeff Sharkey
a45bf7f254 Fix tests that are broken on darwin builds. 
Bug: 292141694
Test: m nothing --no-skip-soong-tests
Change-Id: Ie9a2f8961a8c43bbe1388471fc0d7aadc1456c57
 2023-11-06 14:35:30 -07:00
Jeff Sharkey
37e5e61aeb Merge "Add android_ravenwood_test build rule" into main 2023-11-06 18:47:29 +00:00
Jiakai Zhang
c6879f3ddd Use the correct mainline BCP jars for app dexpreopt. 
Before this change, the build system had special logic to find mainline
BCP jars and copy them to a special location for app dexpreopt. This
logic doesn't work on `next`. In fact, we don't need this logic anymore.
Since we are now generating the mainline boot image extension, we can
reference the inputs of the mainline boot image extension, which are
exactly the mainline BCP jars needed for app dexpreopt.

Bug: 309302263
Test: atest art_standalone_dexpreopt_tests (on next)
Test: m --no-skip-soong-tests nothing

Change-Id: I055018ffbc5d7e5678f305e65a7f1c7e73bf3b99
 2023-11-06 18:44:52 +00:00
Alyssa Ketpreechasawat
0788a7e8bf Merge "Disable verify_overlaps test instead of hiddenapi check." into main am: 98e555c842 am: aa91b88610 am: d186d78927 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816955

Change-Id: I34abbaea5c2114fdd5bd56878482879509181a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 12:46:55 +00:00
Alyssa Ketpreechasawat
5d7eb95911 Merge "Disable verify_overlaps test instead of hiddenapi check." into main am: 98e555c842 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816955

Change-Id: Iee26d5b46aa06ac473648ac7ac2f1e04a031af42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 11:36:22 +00:00
Alyssa Ketpreechasawat
aa91b88610 Merge "Disable verify_overlaps test instead of hiddenapi check." into main am: 98e555c842 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816955

Change-Id: I328905493dcc5c71bf88139fd80520f6259604a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 11:33:40 +00:00
Alyssa Ketpreechasawat
98e555c842 Merge "Disable verify_overlaps test instead of hiddenapi check." into main 2023-11-06 10:53:31 +00:00
Alyssa Ketpreechasawat
7daf2786b6 Disable verify_overlaps test instead of hiddenapi check. 
Disabling hiddenapi check entirely can be dangerous and it might change the
accessibility of @hide Api too. We should only disable verify_overlaps
test which is required for module_sdk and apexes mismatch.

Test: atest CtsInlineMockingTestCases
Bug: 308187068
Bug: 307480026
Change-Id: I44f48e85d802b3a8f2711bc2047bdab721369f08
 2023-11-06 09:49:16 +00:00
Makoto Onuki
32eb1338f0 Add android_ravenwood_test build rule 
Modeled after android_robolectric_test.

Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: m hoststubgen ravenwood-runtime tradefed atest && atest-dev HostStubGenTest-framework-test
Change-Id: Ibef8953db45b86264c8a827868793b42f8f2d6ab
 2023-11-03 10:36:08 -06:00
Michael Stokes
0a57da3973 Merge "Revert "Use R8 for resource shrinking"" into main am: 2e09e68e56 am: b2db840da2 am: 36bc94346a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816956

Change-Id: I86361222e6283804e450ed42fea5b6232ec7d3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 14:03:21 +00:00
Michael Stokes
8a1d9b52e5 Merge "Revert "Use R8 for resource shrinking"" into main am: 2e09e68e56 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816956

Change-Id: Ib92111a8af066ffb5ce339af8ffe49ca29093f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 12:54:11 +00:00
Treehugger Robot
3881adc789 Merge "Update checkapi error message to provide more guidance" into main am: 0978d6a4b1 am: c080eb1d33 am: a212fe657d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816954

Change-Id: Ib01e8c2d4b838e95f7b8a8c1eda371f99715d24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 12:52:19 +00:00
Michael Stokes
b2db840da2 Merge "Revert "Use R8 for resource shrinking"" into main am: 2e09e68e56 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816956

Change-Id: Ibf81e57b1232525a43752ab7bfa5b8d3120719c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 12:51:21 +00:00
Michael Stokes
2e09e68e56 Merge "Revert "Use R8 for resource shrinking"" into main 2023-11-03 12:12:40 +00:00
Treehugger Robot
0bc844d4e6 Merge "Update checkapi error message to provide more guidance" into main am: 0978d6a4b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816954

Change-Id: I80c1e849ff89b747d94740590197eb8c63be597a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 11:43:17 +00:00
Treehugger Robot
c080eb1d33 Merge "Update checkapi error message to provide more guidance" into main am: 0978d6a4b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816954

Change-Id: I6a1fcce0c608632161c29eff6c73a3eccf6cf1eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 11:40:37 +00:00
Treehugger Robot
0978d6a4b1 Merge "Update checkapi error message to provide more guidance" into main 2023-11-03 11:13:02 +00:00
Rico Wind
a9fd59a7f2 Revert "Use R8 for resource shrinking" 
Revert submission 2816534-r8resourceshrinking

Reason for revert: b/309075997

Reverted changes: /q/submissionid:2816534-r8resourceshrinking

Change-Id: Ic173491eaf22967fbad14fbcc85f6ddb2cf54d23
 2023-11-03 10:26:38 +00:00
Rico Wind
e68174b715 Merge "Use R8 for resource shrinking" into main am: 4ea88503e4 am: fd74f8c693 am: ab05095d6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813214

Change-Id: I982d348c98da39a17e4069bbd6a580eed9b469f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 09:20:20 +00:00
Rico Wind
cb5d4a3649 Merge "Use R8 for resource shrinking" into main am: 4ea88503e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813214

Change-Id: I522bc28069400f644faf13f2782630423ad7f0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 08:11:47 +00:00
Rico Wind
fd74f8c693 Merge "Use R8 for resource shrinking" into main am: 4ea88503e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813214

Change-Id: I830d027fdfa080ca4bd29c1e24795148a6d16649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 08:09:07 +00:00
Rico Wind
4ea88503e4 Merge "Use R8 for resource shrinking" into main 2023-11-03 07:29:45 +00:00
Treehugger Robot
a3bb68773a Merge "Remove retrieveLegacyEncodedBootDexFiles" into main am: 81ac6e74df am: df1bcdca0e am: 5179536572 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816477

Change-Id: I1a20a2dfaac70ff9f0419d6e536e2817baf30435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 03:26:44 +00:00