StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,880 Commits 1 Branch 0 Tags
0a57da39735a057e04da19291a30d3edb78cebe0
Commit Graph

7532 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Colin Cross
f059b2f2fc Remove obsolete java version environment variables 
jdk9 and jdk11 are no longer used, remove ANDROID_JAVA9_HOME and
ANDROID_JAVA11_HOME.

Bug: 221270882
Test: treehugger
Change-Id: Iad566bff21055c5e2acd62642ccd579507e21fef
 2023-11-01 20:58:30 +00:00
Spandan Das
b9585e851b Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 am: bfdc9a89e0 am: f72007139d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: If94853a204f6c565b94a71f636c08f1f717fc746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 18:32:05 +00:00
Spandan Das
a86290f27e Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I10282df38584510bd384c3750caad245b4ef9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 17:50:52 +00:00
Spandan Das
bfdc9a89e0 Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I7464d1574398c891b4bca139a4c6a8c8399c9491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 17:48:35 +00:00
Spandan Das
eb852927d4 Merge "Add the name of the sdk library to dynamically generated java modules" into main 2023-11-01 17:31:58 +00:00
Sam Delmerico
1f2d568105 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd am: 0b74fbb608 am: 727dc7ce68 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I3a029e51decdbcc76959cc056c5c2c69cbfe77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 17:11:59 +00:00
Sam Delmerico
92bacc72a1 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I3238b8f999bdde7038d119c8e9926b66d5f852ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 16:09:37 +00:00
Sam Delmerico
0b74fbb608 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I9ced451bbd526c7f399ad0b247255bd7234b1dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-01 16:06:58 +00:00
Sam Delmerico
d9569528bd Merge "transitive r8 flags for installable {android,java}_libraries" into main 2023-11-01 15:29:11 +00:00
Spandan Das
2cc80ba145 Add the name of the sdk library to dynamically generated java modules 
The name of the sdk library will be used in source vs prebuilt
selection. For soong modules that are not dynamically created from a
java_sdk_library, the value will be nil.

Bug: 308174768
Test: TH
Change-Id: Ic7e9889f00c6184992b663a7124967bb0794d475
 2023-10-31 20:57:56 +00:00
Sam Delmerico
c8e040c70f transitive r8 flags for installable {android,java}_libraries 
Only android_apps were actually applying transitive proguard flags files
to their r8 invocation. This CL ensures that this also occurs for
installable android_libraries and java_libraries.

Bug: 302342049
Test: go test ./java
Change-Id: Ie94d688d04367ee3d39e7e760fb3003df5829951
 2023-10-31 18:59:04 +00:00
Alix Espino
137c7c3fc8 Merge "add manifest_values application id property to soong" into main am: a9ead6ef2b am: f98019df2f am: e073f0f8dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769927

Change-Id: Iba14d929eba0592507030e2dfe726491e3e31172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 15:42:37 +00:00
Alix Espino
49f623c92c Merge "add manifest_values application id property to soong" into main am: a9ead6ef2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769927

Change-Id: I9944ae85f9bce8416ee3587ef06f21afe58c02c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 14:37:09 +00:00
Alix Espino
f98019df2f Merge "add manifest_values application id property to soong" into main am: a9ead6ef2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769927

Change-Id: I523dc527ca60db260f3405352c27fc3bacb6a0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 14:34:34 +00:00
Alix Espino
a9ead6ef2b Merge "add manifest_values application id property to soong" into main 2023-10-31 14:17:53 +00:00