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

7947 Commits

Author SHA1 Message Date
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
Treehugger Robot
e8ce8ba499 Merge "Remove retrieveLegacyEncodedBootDexFiles" into main am: 81ac6e74df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816477

Change-Id: I496675d16c6d15443e191a4c80fa6ec604daf52f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 02:18:10 +00:00
Treehugger Robot
df1bcdca0e Merge "Remove retrieveLegacyEncodedBootDexFiles" into main am: 81ac6e74df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816477

Change-Id: Ie1ac557250fb60091e003bd3416f29955b949ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 02:15:29 +00:00
Spandan Das
3e75cfa795 Remove retrieveLegacyEncodedBootDexFiles 
Seems to be an unused function

Test: TH
Change-Id: Ic0b352afc16ccaf450dadb5b13d9fb6c694e72e6
 2023-11-03 00:46:29 +00:00
Jihoon Kang
3ea6467c1c Update checkapi error message to provide more guidance 
With from-text stub feature, checkapi is also used for checking the
sanity of the stubs. Therefore, this change adds more explanatory
message about how the user can rebuild the target when their build
failed with stub validation after local API change.

Test: m nothing
Bug: 309027703
Change-Id: If7c9c287266f3da82edde663619b9f08ee05530d
 2023-11-03 00:40:26 +00:00
Colin Cross
f65c2d7c8d Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir am: f96b001064 am: b6888a8b12 am: 525a8e47ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2806397

Change-Id: I9120fe32ea7d29f36961d8fd572ecfb2755895f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 20:37:46 +00:00
Rico Wind
b56fe2825d Use R8 for resource shrinking 
We are moving the resource shinking pipeline into r8 (gennerally, not just for platform)

This disables the usage of the resource shrinker cli from cmd-line tools

Bug: 308710394

Test: Existing, validated that resource table on SystemUI was byte<>byte equal.
Change-Id: Ia36b5e5970cbdcff519a5f05d672b44dc145ea32
 2023-11-02 20:35:20 +01:00
Jihoon Kang
0831155192 Merge changes from topic "core-lambda-stubs-source" into main am: 412dc7c488 am: 12ea2d90fa am: 16fe36ffc7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814994

Change-Id: I93971d69013b16f4864d55fd44a64d94c2a04b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 19:25:19 +00:00
Colin Cross
4164d0bd87 Merge "Remove obsolete java version environment variables" into main am: f2c51919ad am: 3bc0e28180 am: 92a9542fad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814561

Change-Id: I787a55d2d9f5888f07e7c0f38e349b1f216d104a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 19:25:08 +00:00
Colin Cross
2488ed09f7 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir am: f96b001064 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2806397

Change-Id: Ic17bea5bfe5362592b96860d76e9e7f2c9c61522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 19:24:57 +00:00
Colin Cross
b6888a8b12 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir am: f96b001064 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2806397

Change-Id: I2b83356146272e1e9995124c9549c0d3292a28cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 19:23:07 +00:00
Colin Cross
f96b001064 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir 
ctx.ModuleDir is much cheaper than android.PathForModuleSrc(ctx).String().

Test: builds
Change-Id: I81819088d9564b06a0336a59a45f2b110b0bd9d6
 2023-11-02 19:07:49 +00:00
Jihoon Kang
377752881f Merge changes from topic "core-lambda-stubs-source" into main am: 412dc7c488 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814994

Change-Id: I38fbdaac417380bc248864ae294355aa4ef6c6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:49:10 +00:00
Jihoon Kang
12ea2d90fa Merge changes from topic "core-lambda-stubs-source" into main am: 412dc7c488 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814994

Change-Id: I202cd89b576d1d5c5e614da28e65a80b4cfe0b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:48:23 +00:00
Colin Cross
d72155f0ed Merge "Remove obsolete java version environment variables" into main am: f2c51919ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814561

Change-Id: I841987073791226e2daf55a11b41f32d98cdcbd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:47:30 +00:00
Colin Cross
3bc0e28180 Merge "Remove obsolete java version environment variables" into main am: f2c51919ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814561

Change-Id: Id5ce5b6567e4bc6b1656c475390b847bdc7a46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:47:27 +00:00
Jihoon Kang
412dc7c488 Merge changes from topic "core-lambda-stubs-source" into main 
* changes:
  Remove TxtStubLibraries.bp
  Move core.module_lib.stubs.from-text closer to source
 2023-11-02 17:08:11 +00:00
Colin Cross
f2c51919ad Merge "Remove obsolete java version environment variables" into main 2023-11-02 17:05:06 +00:00
Treehugger Robot
f410e60564 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489 am: 233ec66675 am: 1d8482839d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I52783885f933e81176b0ff45338968e5af11f773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 05:20:31 +00:00
Treehugger Robot
ea40fe5277 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I39d69af62c6247cf544b8557d0d88e074c600a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 04:13:22 +00:00
Treehugger Robot
233ec66675 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I4be5074e92607920fabfdda79b3d707f79e7aa25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 04:11:01 +00:00
Treehugger Robot
a741e88489 Merge "Remove sdkPreSingleton and overlaySingleton" into main 2023-11-02 03:43:15 +00:00
Jihoon Kang
6416a71211 Remove TxtStubLibraries.bp 
The modules defined in TxtStubLibraries.bp are currently not in the
critical path of the from-text stub build, because the from-text vs
from-source switching is encapsulated within the stub library modules.
Therefore, remove the modules altogether.

Test: m nothing --build-from-text-stub
Bug: 287522618
Change-Id: I249edcdf596c8a82058e1bfb17da863c2b5dd7a7
 2023-11-02 01:02:40 +00:00
Jihoon Kang
bfa2f9ec69 Move core.module_lib.stubs.from-text closer to source 
This change moves the core.module_lib.stubs.from-text closer to its
from-source equivalents and its top level module core/module_lib.stubs.

Test: m nothing --build-from-text-stub
Bug: 287522618
Change-Id: Ida6dd613834b36490b1ad79773b9404b1d0d9efc
 2023-11-02 01:02:28 +00:00
Treehugger Robot
f7b061345c Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab am: 54c1f3a86b am: f1a233ec58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: Ib64ec84864d53de9d6bf18d28de398f5cd79d95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 00:50:42 +00:00
Treehugger Robot
b98b24b053 Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: Ia9de5ae8687d436b60a79c50b999fb753d90c9db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 00:16:22 +00:00
Treehugger Robot
54c1f3a86b Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I1f0d5a8b85485f51a2463894194c1cf7ce4d096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 23:44:13 +00:00
Treehugger Robot
9ae2999dab Merge changes I7bc4d8d4,I8158c0b9 into main 
* changes:
  Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs
  Always reset timestamps in merge_zips
 2023-11-01 23:38:29 +00:00
Cole Faust
9bef67488d Remove sdkPreSingleton and overlaySingleton 
These were the only 2 pre-singletons in soong. sdkPreSingleton is
totally unused. overlaySingleton can be done during
GenerateAndroidBuildActions instead.

Test: m nothing --no-skip-soong-tests
Change-Id: Ieb5ab92f18cb56be4049c0842f61df8aa02dc52c
 2023-11-01 15:29:09 -07:00
Colin Cross
c8c2cee06a Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs 
ziptime doesn't support ZIP64 so it is limited to 65535 entries in
a zip file.  Use the newly added support in merge_zips to reset the
timestamp instead.

Bug: 308765940
Test: builds
Change-Id: I7bc4d8d4943e7417af1783a63ac5b5904d2aa751
 2023-11-01 14:41:48 -07:00