Commit Graph

7947 Commits

Author SHA1 Message Date
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
Treehugger Robot
c708f34e84 Merge "Update transitive lib propagation" into main am: 3d9ba8ff90 am: bbadb623c1 am: 4d2cb52875
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808361

Change-Id: If432e96364d556dc0108baeeb8624cc8703309f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 05:30:57 +00:00
Treehugger Robot
f3d826d09c Merge "Update transitive lib propagation" into main am: 3d9ba8ff90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808361

Change-Id: Id2bfd9d7a5387a354cf882a498c312204b0f5a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 04:58:03 +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
fc25212062 Merge "Remove UnavailableSymbol from warnings to disable" into main am: 8e586ab8b3 am: be3c32b33d am: f95cb32627
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2805913

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

Change-Id: Ib5a38f1adef73dfd627a207ab85bf27ece6a904b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 08:37:12 +00:00
Anton Hansson
09f168dc07 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: I1ad2f6f547b53ac3a077fdb7cdc85dc3fe55215b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 08:08:10 +00:00
Anton Hansson
a5fa3dc54d 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: Id58e27352eb993c4835b92ef283fa1e1f694c203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 08:07:55 +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
41c77c8fe6 Merge "Don't minimize debug information if module explicitly asks for it" into main am: 4efd3365cc am: cfb87f5968 am: 53df5aa247
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803327

Change-Id: I70f50f254714bf0e5e72ca97ddae069c43fe26ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 09:37:24 +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
cfb87f5968 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: I6095259a3e71f8e9b38b6abde2a77d4c02322208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 08:42:43 +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
7c041f77c1 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: I0e10ed7d9d51d3968c517452631c528825ba10a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 12:59:38 +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
8270d67ad9 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

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

Change-Id: Ie5b2863cd487973d56b3894bf70a0c32acb3b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:53:20 +00:00
Alan Viverette
f80899cd23 Handle Android.bp files in subdirectories of androidx am: ec26327735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I746f4369e68226b86ca8d2bcb13149ef01371422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:07:55 +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
88c709182c Merge "support toggling compare mode for rbe actions" into main am: f76b3267d5 am: cb1af7d75b am: 53646a8217
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796314

Change-Id: Ib19677272ab4c591a97c1e7919071206905e036d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 15:44:21 +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
cb1af7d75b 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: Idb625dae1a2b621b5a15a5d1a4e9872d123bf210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 15:02:15 +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
cdc24a672d Merge "Disable from-text stub build for coverage build" into main am: 04803d4767 am: 89c8d9012c am: eda9671faf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2789434

Change-Id: I15508f6af1f094d1be5073c62ed7a97b93e826a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 00:09:54 +00:00
Jihoon Kang
89c8d9012c 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: I326b3fc11d21ca9e5e3834810ad54dff92668f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 20:00:51 +00:00