Commit Graph

63722 Commits

Author SHA1 Message Date
Jihoon Kang
43c72c157a Merge "Rename output stubs jar file in java_api_library" am: ece6a80b08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462253

Change-Id: I95c5fff5e04b38b5bdd631ebc24ef6ac289392e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 17:45:39 +00:00
Sorin Basca
3d693ce4b4 Merge "Revert "Revert "Switch to use new Doclava""" am: a05f0437fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2463154

Change-Id: I47fec5a03997d40a2f8f795534bd8886329379c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 17:45:08 +00:00
Jihoon Kang
ece6a80b08 Merge "Rename output stubs jar file in java_api_library" 2023-03-01 17:18:53 +00:00
Sorin Basca
a05f0437fe Merge "Revert "Revert "Switch to use new Doclava""" 2023-03-01 17:15:25 +00:00
Treehugger Robot
7f73e5831e Merge "Update non-user-facing properties to be mutated" am: f58396a4c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460215

Change-Id: I2d0572f1b741deb264648c07956a2315bcc168c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 16:31:14 +00:00
Treehugger Robot
f58396a4c7 Merge "Update non-user-facing properties to be mutated" 2023-03-01 15:49:17 +00:00
Sorin Basca
ae995aeef4 Revert "Revert "Switch to use new Doclava""
This reverts commit 32db73188d.

Reason for revert: Failing branches now have the updated Doclava (automerger encountered a conflict which led to build failure). Relanding.

Change-Id: Ib327e54898e97a93dd6140a65f2d7231ffd4cef3
2023-03-01 08:47:42 +00:00
Sorin Basca
8fcec519ff Merge "Reland^2 "Target Java 17"" am: b0dc477ef7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2438064

Change-Id: Ia97c87f062832a49482c7c9615d78fde5036362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 07:08:22 +00:00
Sorin Basca
b0dc477ef7 Merge "Reland^2 "Target Java 17"" 2023-03-01 06:20:20 +00:00
Yi Kong
f838a8a4d6 Merge "Update clang version to clang-r487747" am: 29ff4182f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434853

Change-Id: I9cf13db3da14299de930386ce73b9b253c63eccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 05:16:33 +00:00
Yi Kong
29ff4182f5 Merge "Update clang version to clang-r487747" 2023-03-01 05:02:15 +00:00
Treehugger Robot
631ad00a41 Merge "Replace SortedStringKeys with SortedKeys" am: 0f0d3ce49c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462193

Change-Id: Ia4153e6fd8bcee6636907fb87c4a8cd61aa2786e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:56:32 +00:00
Treehugger Robot
0f0d3ce49c Merge "Replace SortedStringKeys with SortedKeys" 2023-03-01 04:29:09 +00:00
Treehugger Robot
a1676ce4ca Merge "Create a ninja.environment file" am: 732592c151
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460214

Change-Id: I5462a79eee0e6ef9961db3ffe48fae3e4e4c2321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 03:59:42 +00:00
Treehugger Robot
732592c151 Merge "Create a ninja.environment file" 2023-03-01 03:22:31 +00:00
Jihoon Kang
25857f5f42 Rename output stubs jar file in java_api_library
When generating framework.aidl, `android_*_stubs_current` are converted
to .aidl files (and created as targets) by replacing the extension from
`.jar` to `.aidl`.
Thus, when replacing `android_*_stubs_current` to java_api_library
modules, generating `android.jar` files leads to ninja error(multiple
rules for generating */android.aidl error).
Prevent this error by renaming the name of the artifact jar file as the
module name so that distinct-named ninja targets can be created.

Test: m
Change-Id: Iaa7248996d7bf5e7f98e1d1e2919870c3cccf5a6
2023-03-01 01:11:18 +00:00
Cole Faust
18994c73f1 Replace SortedStringKeys with SortedKeys
Now that we have generics.

Bug: 193460475
Test: presubmits
Change-Id: I1594fd8feb505175d5c09c03ef397e5ffd5b09cb
2023-02-28 16:51:32 -08:00
Cole Faust
e9e590670f Merge "Disable strict_updatability_linting" am: 20eed826fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458068

Change-Id: I3ef301daab9e0341d60d2266e6a5290e2b9dd916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:37:49 +00:00
Cole Faust
20eed826fd Merge "Disable strict_updatability_linting" 2023-02-28 23:53:51 +00:00
Spandan Das
2db59da973 Create a ninja.environment file
This contains the environment variables set by soong_ui during the ninja
execution. This file will be unused in single-tree builds, but will be
useful for multi-tree. The orchestrator will use this file to set the
correct environment for each inner tree build in the combined ninja
execution.

Test: m nothing compiles
Change-Id: I0570e34f51f426448464fb80030d4bea1cd52acb
2023-02-28 23:49:22 +00:00
Treehugger Robot
1decfa2cbc Merge "Omit "--compiler-filter" if the profile is disabled." am: 15e6b1240e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460212

Change-Id: I09150b09b997b416f466e8c1dd8de11d69da75ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:00:22 +00:00
Spandan Das
812fc6cc23 Merge "Update usages of min_sdk_version that relies on (kind+level)" am: c8054ec6ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2457061

Change-Id: I65855232e3e40985aa10e853f12d579e02cf674e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:51:56 +00:00
Omar Eissa
b9827546a7 Merge "Revert "Enable -Wformat-insufficient-args globally"" am: e1271f8c2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460210

Change-Id: Ic8ec81630361d21e7ec3df5020e13f54a659f0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:46:58 +00:00
Treehugger Robot
ed35636ad9 Merge "Enable -Wformat-insufficient-args globally" am: b6de89a232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458511

Change-Id: I06eccca0641cd6cfe9a6835859097a669bec09db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:39:27 +00:00
Cole Faust
1021ccda6b Disable strict_updatability_linting
strict_updatability_linting currently only makes it so
that NewApi can't be added to the lint baseline.
However, since we're updating NewApi to work on a lot
more apis than before, we need to baseline many issues
across the android tree. Temporarily disable
strict_updatability_linting so that we can add these
baselines.

Bug: 193460475
Test: Presubmits
Change-Id: I8d92df95a46e9b903f0cc0e3be56f17722c50430
2023-02-28 11:31:15 -08:00
Liz Kammer
884fe9e174 Update non-user-facing properties to be mutated
Test: m nothing
Test: CI
Change-Id: Ibfbb91653fa36277a19555a39a5df8da27a7a765
2023-02-28 14:29:13 -05:00
Treehugger Robot
15e6b1240e Merge "Omit "--compiler-filter" if the profile is disabled." 2023-02-28 18:53:44 +00:00
Spandan Das
c8054ec6ac Merge "Update usages of min_sdk_version that relies on (kind+level)" 2023-02-28 16:44:53 +00:00
Jiakai Zhang
63086d7af0 Omit "--compiler-filter" if the profile is disabled.
This fixes the Golem regression caused by aosp/2453067. On Golem, the
profile disabled and dex2oat uses the default "speed" compiler filter.

Bug: 269230245
Test: art/tools/golem/build-target.sh --machine-type=android-armv8 --golem=art-interpreter
Change-Id: I4fc0dbf9eac8839f7bacd264ddab177956ddd58e
2023-02-28 15:37:31 +00:00
Omar Eissa
e1271f8c2d Merge "Revert "Enable -Wformat-insufficient-args globally"" 2023-02-28 11:15:44 +00:00
Omar Eissa
fabd0dd8d3 Revert "Enable -Wformat-insufficient-args globally"
This reverts commit 49f09a3694.

Reason for revert: b/271045282

Change-Id: Ice56137c5567a38d15cc39f80497ce74bc18650f
2023-02-28 11:08:57 +00:00
Treehugger Robot
b6de89a232 Merge "Enable -Wformat-insufficient-args globally" 2023-02-28 03:32:20 +00:00
Cole Faust
8be6ea178a Merge "Add BUILD_BROKEN_PYTHON_IS_PYTHON2" am: 7ba7b46fce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458989

Change-Id: Ia618756cb03a18523751cf59342cd79280ac2055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:08:30 +00:00
Cole Faust
7ba7b46fce Merge "Add BUILD_BROKEN_PYTHON_IS_PYTHON2" 2023-02-28 00:30:47 +00:00
zijunzhao
49f09a3694 Enable -Wformat-insufficient-args globally
Bug: b/191699019
Test: m
Change-Id: Ib71a422a7a1621c0994ea07a90fa9ab914fcc6fd
2023-02-27 22:55:01 +00:00
Cole Faust
b1fbc79206 Add BUILD_BROKEN_PYTHON_IS_PYTHON2
This provides an escape hatch to undo the effects of
aosp/2417672. It's an enviornment variable instead of
a product config variable because python is often used
during product config.

Bug: 203436762
Test: m nothing and get_build_var with aosp/2458935
Change-Id: I0dd0f7c221427ea487fd7993aef68ce803eaff21
2023-02-27 13:02:02 -08:00
Chris Wailes
7250b0f484 Merge "Disallow the use of new unstable features" am: 5f6e2ade1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2457065

Change-Id: I477da4afd355066147de2a1a6d962a1283b72ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:56:50 +00:00
Sorin Basca
deac31ef48 Merge "Revert "Switch to use new Doclava"" am: 29b20ea4a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458512

Change-Id: Ib992972d2c829a385833a71346e4dfb330a9bc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:54:53 +00:00
Chris Wailes
5f6e2ade1f Merge "Disallow the use of new unstable features" 2023-02-27 20:54:48 +00:00
Yu Liu
06ee3d7444 Merge "Add a test to compare the DCLA libs across the apexes." am: ec992247d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2455760

Change-Id: I8a56459d266dec99e27944e92515b1d5155e3547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:52:54 +00:00
Spandan Das
e35fbea7f4 Merge "Update usages of min_sdk_version that relies on (kind+level)" am: 0cd201c6b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374713

Change-Id: I7d64470b874fd2fcddc3fe52346c59dc8306bb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:52:39 +00:00
Sorin Basca
29b20ea4a8 Merge "Revert "Switch to use new Doclava"" 2023-02-27 20:41:03 +00:00
Spandan Das
b2663e3967 Merge "Add documentation for target-sdk-version flag" am: 26cfa5c70d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453071

Change-Id: Ic5ded367e5781e93244d0d4316ac043b4ad12c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 20:36:29 +00:00
Sorin Basca
32db73188d Revert "Switch to use new Doclava"
This reverts commit 702fb3bdc9.

Reason for revert: Build breaks in some branches

Change-Id: I3502b86d1a2e1afd6bc32e02287cd903bad7b9b2
2023-02-27 20:34:18 +00:00
Spandan Das
7fa982c0ec Update usages of min_sdk_version that relies on (kind+level)
The type of min_sdk_version is being migrated from
android.SdkSpec(kind+level) to android.ApiLevel(level). This affects
`ShouldSupportSdkVersion` for java modules. This function skips the
check for modules compiling against `core`, and that requires access to
SdkVersion and not MinSdkVersion after the migration.

Skip the check explicitly using SdkVersion.

Test: go test ./java
Test: No change in ninja file
Bug: 208456999
Change-Id: I14eca4f8e8c5d7477ded00c4fe54097323fab4a2
2023-02-27 20:03:25 +00:00
Yu Liu
ec992247d1 Merge "Add a test to compare the DCLA libs across the apexes." 2023-02-27 19:13:52 +00:00
Spandan Das
0cd201c6b5 Merge "Update usages of min_sdk_version that relies on (kind+level)" 2023-02-27 18:39:11 +00:00
Sorin Basca
d4b12683f5 Merge "Switch to use new Doclava" am: 6cf6f8032e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2451006

Change-Id: I106ccbad6d2528e5066cf4518c0fe790accae1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 18:00:53 +00:00
Spandan Das
26cfa5c70d Merge "Add documentation for target-sdk-version flag" 2023-02-27 17:49:33 +00:00
Sorin Basca
6cf6f8032e Merge "Switch to use new Doclava" 2023-02-27 16:53:45 +00:00