Commit Graph

63979 Commits

Author SHA1 Message Date
Treehugger Robot
870b563ca7 Merge "Remove OWNERS access for non-build team people to core build system" am: 8c41eca698 am: 6e8d362f83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462613

Change-Id: Id603b5f4b79319921da94856e9fcbb697fd6f930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 20:45:15 +00:00
Cole Faust
82a5576d48 Merge "Give lint the correct api levels database for the current module" am: 917eb06be3 am: f84099023b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412734

Change-Id: Ibd8b4c49e04ac1d2ff43e582df85dcc3c794b1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 20:44:37 +00:00
Treehugger Robot
6e8d362f83 Merge "Remove OWNERS access for non-build team people to core build system" am: 8c41eca698
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462613

Change-Id: I47645c38519b3d2bb1fb5d261adf4c986ea6f118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:54:07 +00:00
Treehugger Robot
8c41eca698 Merge "Remove OWNERS access for non-build team people to core build system" 2023-03-01 19:45:38 +00:00
Cole Faust
f84099023b Merge "Give lint the correct api levels database for the current module" am: 917eb06be3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412734

Change-Id: I1274f89d87e28c4965946e88038f58b26b15a8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:35:05 +00:00
Cole Faust
917eb06be3 Merge "Give lint the correct api levels database for the current module" 2023-03-01 18:59:05 +00:00
Jihoon Kang
f8fc1d254e Merge "Rename output stubs jar file in java_api_library" am: ece6a80b08 am: 43c72c157a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462253

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

Change-Id: I927dd96a627dd4779667369b63b883adcd29e655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 18:21:33 +00:00
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
Treehugger Robot
7940beb23e Merge "Update non-user-facing properties to be mutated" am: f58396a4c7 am: 7f73e5831e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460215

Change-Id: I7055983541fba6a037450b01eeb71f0a8effa03d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 17:24:59 +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
a98b719472 Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 am: 8fcec519ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2438064

Change-Id: I1ea8f34f94ab597fa9221c7d1ebd642aa2d20741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 07:43:28 +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
fe47748e38 Merge "Update clang version to clang-r487747" am: 29ff4182f5 am: f838a8a4d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434853

Change-Id: I14a3ec6e8f8cde48bbb3ebcb0dcbcc695e126935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 05:54:01 +00:00
Treehugger Robot
155ae26780 Merge "Replace SortedStringKeys with SortedKeys" am: 0f0d3ce49c am: 631ad00a41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462193

Change-Id: I9cf91542a7f2fa0b3779671838540415a1089542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 05:53:40 +00:00
Cole Faust
69861aa57f Give lint the correct api levels database for the current module
Before this change, lint was always working off of the public
api database. Now, it will have the system, module-lib, or
system-server databases if the current module is compiling
against those SDKs.

This means that a lot more methods are going to start being
checked for NewApi issues.

Bug: 193460475
Test: Errorprone presubmit
Change-Id: I3eb2c617cd61554cd2a3f9d15fd40b3ec91f961d
2023-02-28 21:18:17 -08: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
2f5a9954b3 Merge "Create a ninja.environment file" am: 732592c151 am: a1676ce4ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460214

Change-Id: I334167ec939824005912a6811cc71c07120b09d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:37:12 +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
Joe Onorato
442b6fc701 Remove OWNERS access for non-build team people to core build system
Test: treehugger
Change-Id: I0c318ddd7d78110327bbd849ed9aa3973c86de5d
2023-02-28 19:29:47 -08:00
Treehugger Robot
732592c151 Merge "Create a ninja.environment file" 2023-03-01 03:22:31 +00:00
Cole Faust
5080e5d56b Merge "Disable strict_updatability_linting" am: 20eed826fd am: e9e590670f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458068

Change-Id: I33064ac7303ad0380dcdb82b863d459ac42ac7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:32:02 +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
6260dec22f Merge "Omit "--compiler-filter" if the profile is disabled." am: 15e6b1240e am: 1decfa2cbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2460212

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

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

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

Change-Id: Iff9d0bd2c815351e1b19c554178bdc63464c1568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:07:19 +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