StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,248 Commits 1 Branch 0 Tags
d72155f0ed42be9c4ad28094a36bcf7563f91ffc
Commit Graph

7245 Commits

Author SHA1 Message Date
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
f2c51919ad Merge "Remove obsolete java version environment variables" into main 2023-11-02 17:05:06 +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
a741e88489 Merge "Remove sdkPreSingleton and overlaySingleton" into main 2023-11-02 03:43:15 +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
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
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
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
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
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
a9ead6ef2b Merge "add manifest_values application id property to soong" into main 2023-10-31 14:17:53 +00:00
Treehugger Robot
bbadb623c1 Merge "Update transitive lib propagation" into main am: 3d9ba8ff90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808361

Change-Id: If006108cfad58951e97e1281c00cc3e7210cab61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 04:29:20 +00:00
Jared Duke
efb6d60210 Update transitive lib propagation 
Only propagate transitive libs by way of library-like references. This
avoids inclusion of transitive deps from tools like lint modules that
are unncessary for R8.

This yields build speedups for a number of targets, including:
 * services.jar:            -22% (66s -> 51s)
 * telephony-common.jar:    -27% (29s -> 21s)
 * updatable-media.jar:     -41% (17s -> 10s)
 * framework-appsearch.jar: -46% (13s ->  7s)

Bug: 302383328
Bug: 307273642
Test: m
Change-Id: I60bb30e84dabe522ea9ac9333f00e739962ea91d
 2023-10-27 22:48:13 +00:00
Anton Hansson
be3c32b33d Merge "Remove UnavailableSymbol from warnings to disable" into main am: 8e586ab8b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2805913

Change-Id: I195d1057f5950ef2b906b018ac339d5e5423b58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 07:41:28 +00:00
Anton Hansson
7a86ad12d9 Merge "Remove HiddenTypeParameter from warnings to disable" into main am: aa5b2cd37b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2805914

Change-Id: I7167ed9bbf13e4ffd141ed181ab02075f537495b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 07:41:16 +00:00
Anton Hansson
8e586ab8b3 Merge "Remove UnavailableSymbol from warnings to disable" into main 2023-10-27 07:36:35 +00:00
Anton Hansson
f9a2bc0e4b Remove HiddenTypeParameter from warnings to disable 
Bug: 306806877
Test: m checkapi
Change-Id: I68036ad7fc24cda8673379a218ecbb26aa48ad8f
 2023-10-26 15:13:26 +00:00
Anton Hansson
70f74de4cb Remove UnavailableSymbol from warnings to disable 
Bug: 306806877
Test: m checkapi
Change-Id: If8ad3cf37d84ec30c886a0e6d094ea451c4c3d75
 2023-10-26 14:35:39 +00:00
Mythri Alle
5c450a5fb6 Merge "Don't minimize debug information if module explicitly asks for it" into main am: 4efd3365cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803327

Change-Id: I4c1dc2def39619fd094186d084d448e62d654521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 08:44:41 +00:00
Mythri Alle
4b9f618a76 Don't minimize debug information if module explicitly asks for it 
In some configurations (for ex: go, auto) we minimize debug information
to reduce disk and memory usage. However some tests need the debug
information to work as expected. If a test explicitly requests for debug
information by passing "-g" to javac flags don't add "-g:source,lines"
to minimize debug information. Javac gives priority to -g:source,lines
and doesn't respect the order. So check if there is a -g flag before
adding flags to minimize debug information.

Test: atest CtsJvmtiRunTest1912HostTestCases android.jvmti.cts.JvmtiHostTest1912#testJvmti
Change-Id: I45e0f5fa9e79c16c2ff6e9413941a9a637753653
 2023-10-25 16:50:41 +00:00
Anton Hansson
4da84d851a Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716

Change-Id: Ia2e05bafe3b12f3366c96e3eef5544ea5a4e4051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 12:59:17 +00:00
Anton Hansson
05eabd9c4d Merge "Created empty framework-location non-updatable module" into main 2023-10-24 12:43:36 +00:00
Anton Hansson
2d7bb94e31 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: I181d4003899884ea326b10e1dfe0f4f5feb4c593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 10:30:14 +00:00
Anton Hansson
af1c929943 Merge "SdkTestCore for non-updatable modules" into main 2023-10-24 10:06:54 +00:00
Alan Viverette
97633e43da Handle Android.bp files in subdirectories of androidx am: ec26327735 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I466fc52ff56ce2bab213cada9efbeb265a45802d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 21:07:07 +00:00
Alix
96ea8845c5 add manifest_values application id property to soong 
Bug:278905106
Test: go test ./java --run TestManifestValuesApplicationIdSetsPackageName
	and locally built a module and checked manifest pacakge_name
Change-Id: I5c8fd27c177b9e255dce197706f62580894008cb
 2023-10-23 18:26:53 +00:00
Alan Viverette
ec26327735 Handle Android.bp files in subdirectories of androidx 
Bug: 304263344
Test: m droid
Change-Id: I473d017ed3169137cc234f7fbd5f01d5ad889cb2
 2023-10-23 13:25:13 -04:00
Mark White
9421c4ceb9 SdkTestCore for non-updatable modules 
Provides SdkTestCore/test_core_current sdk_version for non-updatable
modules that have their test scope dependent on test apis from
framework-minus-apex.

Ignore-AOSP-First: Change in topic with internal-first projects
Bug: 289776578
Test: m checkapi | go test ./java

Merged-In: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
Change-Id: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
 2023-10-23 15:25:55 +00:00
Anas Sulaiman
5e404e0580 Merge "support toggling compare mode for rbe actions" into main am: f76b3267d5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796314

Change-Id: Ica21f1662bc955f1030cf6e6775d976a4c2a4419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 15:03:57 +00:00
Anas Sulaiman
f76b3267d5 Merge "support toggling compare mode for rbe actions" into main 2023-10-20 14:41:18 +00:00
Jihoon Kang
dd3491dcbe Merge "Disable from-text stub build for coverage build" into main am: 04803d4767 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789434

Change-Id: I14b132f22c9e1486dda8baaf9b400018bb2f7d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 20:00:51 +00:00
Jihoon Kang
04803d4767 Merge "Disable from-text stub build for coverage build" into main 2023-10-19 19:22:33 +00:00
Cole Faust
d342eaa5c7 Merge "gofmt soong" into main am: 14c1ed8d7d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797038

Change-Id: I4e3a84df5dbfe4ab58b4064f84a516e69b0c6cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 04:21:15 +00:00
Cole Faust
14c1ed8d7d Merge "gofmt soong" into main 2023-10-19 03:48:45 +00:00
Cole Faust
06ea531ab3 gofmt soong 
Test: Presubmits
Change-Id: Ia76c35ba51685eca29df51738000eacd3f43ce20
 2023-10-18 17:42:59 -07:00
Treehugger Robot
b1c9fc707e Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main am: 8e592ad109 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796694

Change-Id: I5a10ce519e0a953a93d78cb11d3ef6a122c2992e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 00:15:55 +00:00
Treehugger Robot
8e592ad109 Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main 
* changes:
  Revert "Don't use java_library for java_import neverlink"
  Revert "Do not convert sdk_version: "none""
 2023-10-18 23:38:27 +00:00
Treehugger Robot
5d34fea011 Merge "Shard Javac" into main am: eecf47b14c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768337

Change-Id: I1dc969b7a0639fda21501f2cc6c6728ed2767e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 22:33:50 +00:00
Treehugger Robot
eecf47b14c Merge "Shard Javac" into main 2023-10-18 22:20:39 +00:00
Liz Kammer
e11182283f Revert "Don't use java_library for java_import neverlink" 
Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I4fbe5fa54dc11fac898a7f15704833f01b9fa269
 2023-10-18 20:38:37 +00:00
Liz Kammer
05f487a4cd Revert "Do not convert sdk_version: "none"" 
Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I309e269db70d9fedaf010ef44791516392fcb4ea
 2023-10-18 20:38:37 +00:00
Anas Sulaiman
9c4936405e support toggling compare mode for rbe actions 
This allows me to set metalava actions to run remotely (already toggleable) with local comparison (this CL).

Change-Id: I66b006d5ee11b3192ef81a2e5cefc07e9f3d10a2
 2023-10-18 19:37:24 +00:00
Colin Cross
5380e6ef71 Merge "Export resource processor R.jar files to ASfP" into main am: c292fa1797 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794454

Change-Id: I40c966fae64ec8a026880ef30cd5fa1b022ccac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 19:21:55 +00:00
Colin Cross
c292fa1797 Merge "Export resource processor R.jar files to ASfP" into main 2023-10-18 18:24:48 +00:00