Commit graph

5880 commits

Author SHA1 Message Date
Colin Cross
d1a81a9ac9 Merge "Increase errorprone heap size" am: ea74a4779f am: 16836c4613 am: 025c13b6cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2003070

Change-Id: Iedfc5c83d5b8b0c75e751f5d7522b456f9f71276
2022-03-01 00:13:48 +00:00
Colin Cross
ea74a4779f Merge "Increase errorprone heap size" 2022-02-28 23:02:12 +00:00
Colin Cross
8bf6cad170 Increase errorprone heap size
Increase the size of the errorprone heap to fix OOM exceptions.

Bug: 221480398
Test: forrest
Change-Id: Ia74fd4ecc57f08bcbaa1388e0734ee0cce8ae1a4
2022-02-28 13:10:50 -08:00
Thiébaud Weksteen
76be154bbd Merge "Add AIDL enforce_permissions attribute" am: 315352e71c am: 7268797ae1 am: f0432a89d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1989107

Change-Id: Idcb6487c5d09e6ea166b0ba0ce547b9376e8d41e
2022-02-24 03:48:19 +00:00
Thiébaud Weksteen
315352e71c Merge "Add AIDL enforce_permissions attribute" 2022-02-24 02:25:20 +00:00
Aurimas Liutikas
b49d0deed1 Merge "Disable new ApiLint check temporarily" am: 8b99da5f37 am: 9e69e0e221 am: b1485db02d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1846434

Change-Id: I0d50ce54e3fcffa769a9999586ceee212ff8d73b
2022-02-23 23:20:10 +00:00
Thiébaud Weksteen
de8417c707 Add AIDL enforce_permissions attribute
When set to true, this attribute will pass down the
-Wmissing-permission-annotation flag to the aidl compiler. It is
possible to declare a set of exceptions (for a graduable adoption). For
now, only Java is supported.

Test: build having the attribute enabled for frameworks/base
Bug: 220214993
Change-Id: I54350199b4d980aef0050519e3daf1fef616d08c
2022-02-24 10:15:27 +11:00
Aurimas Liutikas
8b99da5f37 Merge "Disable new ApiLint check temporarily" 2022-02-23 21:43:55 +00:00
Sam Delmerico
b80790ec41 Merge "convert java proto libraries with bp2build" am: bc83b504ff am: 4dc3df7be7 am: 0d8dd4692b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975287

Change-Id: Ie93ce69b956aedbd4999283886ef9340d88fe530
2022-02-23 17:57:13 +00:00
Anton Hansson
c74bf242ce Merge "Revert "Disable a few metalava checks that platform fails after improvements."" am: 2ace628b86 am: 2c1345a2a5 am: 3955122289
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1994313

Change-Id: I0f12d6723b85f88a55398e04be7ae1898ad4c207
2022-02-23 17:56:57 +00:00
Sam Delmerico
bc83b504ff Merge "convert java proto libraries with bp2build" 2022-02-23 16:13:15 +00:00
Anton Hansson
2ace628b86 Merge "Revert "Disable a few metalava checks that platform fails after improvements."" 2022-02-23 10:22:28 +00:00
Anton Hansson
75d6c5ee4e Merge changes from topics "extdir", "threadvars" am: d2149e6a81 am: df4ea086a4 am: 8a05c8df34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988355

Change-Id: I32ff394f3ad40300c74ae3b6ece49d5863cd5fb6
2022-02-22 15:04:19 +00:00
Anton Hansson
ff5f3b9dc7 Revert "Disable a few metalava checks that platform fails after improvements."
This reverts commit 1a0fa38342.

Reason for revert: No longer needed
Bug: 217545629
Bug: 217552813

Change-Id: I6db416c6f30a662752687b33c9824bbd8fa9fd2b
2022-02-22 14:09:05 +00:00
Anton Hansson
d2149e6a81 Merge changes from topics "extdir", "threadvars"
* changes:
  Add support for sdk extensions in prebuilt_apis
  Refactor prebuilt_apis.go
  Add base sdk extension version to the config
2022-02-22 13:46:47 +00:00
Anton Hansson
3a3f169b56 Add support for sdk extensions in prebuilt_apis
This makes it possible to pass an extensions_dir containing finalized
module APIs to prebuilt_apis. The extension versions are compared to the
api level versions to figure out what the "latest" finalized API is for
each module. This is done using the base_sdk_extension_version, such
that any extension higher than than base_sdk_extension_version is
assumed to be finalized after any of the existing api level versions.

Bug: 220086085
Test: prebuilt_apis_test.go
Test: existing module in prebuilts/sdk
Change-Id: Ib792f84202d436f594ba5e8716c6a187f9cd60dc
2022-02-21 16:43:43 +00:00
Anton Hansson
06fd5ea171 Merge "Sort the list of hidden warnings" am: ca0ca60502 am: 0c5f8233e5 am: b93c87eee0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1990717

Change-Id: I829a4d0eb592f3236e5b507e184aa5e3274441c1
2022-02-21 15:30:37 +00:00
Anton Hansson
3c0779a6b1 Sort the list of hidden warnings
The list was difficult to read.

Test: m nothing
Change-Id: I55c55033e411f891083264942c543dcd45540c75
2022-02-18 19:24:30 +00:00
Anton Hansson
377318b33f Refactor prebuilt_apis.go
Improve code re-use and improve the names and data types of various vars
and functions. This makes it easier to extend it for the new use-case of
also supporting sdk extension versions on top of the current api level
versions.

This change is intended to be a noop.

Bug: 220086085
Test: m nothing (existing soong tests)
Change-Id: Icf4b320285f791e3b335f71f3c8b1ac52129dbc9
2022-02-18 15:34:37 +00:00
Treehugger Robot
03ab128215 Merge "Revert^2 "Remove the primary boot image from the ART APEX."" am: 59060e093d am: 178dc9a276 am: 2b0a51c343
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988866

Change-Id: Ifac7754e085e193b25bd8074249ee1065a25b668
2022-02-18 10:20:14 +00:00
zhidou
a2ce78f80d Make "overrides" attribute of Android_app overridable
Move overrides attribute from appProperties to overridableAppProperties

Bug: 220029162
Test: m
Change-Id: I6f527df3173f142311734333ad37018c83d5e279
2022-02-17 13:40:53 +00:00
Treehugger Robot
59060e093d Merge "Revert^2 "Remove the primary boot image from the ART APEX."" 2022-02-17 10:31:42 +00:00
Jiakai Zhang
d7f55164a0 Revert^2 "Remove the primary boot image from the ART APEX."
fb14676ed4

Change-Id: I221cb84e7a38393a42ddda2042d25af3aad1ccf1
2022-02-16 17:45:39 +00:00
Sam Delmerico
c768102bce convert java proto libraries with bp2build
Allow java_libraries that depend on protobufs to be converted with
bp2build.

Bug: 215230097
Test: build/bazel/ci/bp2build.sh
Change-Id: I3ce52389e7e4e82755605ee277c1e527a6aebc6b
2022-02-15 21:04:59 +00:00
Sam Gilbert
09cb5dbe29 Disable new ApiLint check temporarily
This should be reverted/re-enabled once car-lib no longer throws
errors for the method fixed in aosp/1840533

Test: n/a
Bug: 144855352
Change-Id: Ifc1a135360d9d357237f5dbe5904f6e77b18a94a
2022-02-15 16:48:40 +00:00
Jiakai Zhang
f0a85f8611 Merge "Revert "Remove the primary boot image from the ART APEX."" am: e51b2377f5 am: 1283b87457 am: ba249a585c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984988

Change-Id: I2e9bae8c9322a700aa6b293a05c2eeff3d040cfe
2022-02-14 14:23:53 +00:00
Jiakai Zhang
e51b2377f5 Merge "Revert "Remove the primary boot image from the ART APEX."" 2022-02-14 13:39:57 +00:00
Jiakai Zhang
fb14676ed4 Revert "Remove the primary boot image from the ART APEX."
Revert submission 1946769-boot-image-flip-b211973309

Reason for revert: Broke golem
Reverted Changes:
I80ffd9160:Remove the primary boot image from the ART APEX.
I45aaa5984:Remove the primary boot image from the ART APEX.

Change-Id: I9167a12cb158ede140dd44dc4458b0770c858379
2022-02-14 12:14:01 +00:00
Jiakai Zhang
ecc46828c9 Merge "Remove the primary boot image from the ART APEX." am: 135103e381 am: 19cc01abc2 am: 6d44add326
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947128

Change-Id: Iaec78f236c1f3819690ab36efd5acb8a11bbccbb
2022-02-14 11:17:07 +00:00
Jiakai Zhang
135103e381 Merge "Remove the primary boot image from the ART APEX." 2022-02-14 09:59:16 +00:00
Pedro Loureiro
fe7d5f48a3 Pass shared library updatability attributes as strings am: b638c62620 am: 123a7a7266 am: 59c7e5459d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1982906

Change-Id: I9c305a750e6df8a9c7bb8836a86c63ac6816ee5f
2022-02-11 22:05:40 +00:00
Pedro Loureiro
b638c62620 Pass shared library updatability attributes as strings
Migrate from ints to Strings so we can pass codenames. Otherwise we
can't use these attributes representing a release in progress until that
release is finalized. I.e. if release T is in progress, we don't get the
correct behaviour if we use "T" in those attributes

Bug: 191978330

Test: m nothing
Change-Id: I35389da0a01549ba2f820f5e5b78f6ea88c2aea1
2022-02-11 17:59:36 +00:00
Treehugger Robot
5a2f2397e3 Merge "add support for java stream protos in protoDeps" am: d107272436 am: a5b9712117 am: 04f697ffc4 am: 9da60d7951
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1972759

Change-Id: If2c7d2e1f3935ed278c1e360f6f07897bcf337de
2022-02-11 02:45:34 +00:00
Treehugger Robot
d107272436 Merge "add support for java stream protos in protoDeps" 2022-02-11 01:19:32 +00:00
Gurpreet Singh
aa858d405c Merge "Manifest Fixer Params code refactor" am: 7761de5d4e am: bdf5b8030e am: 5f93fb0f44 am: e692318fe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1979469

Change-Id: I2cd15fc63d2e9f96b081732236c1f8aed6bb30e3
2022-02-10 19:11:08 +00:00
Gurpreet Singh
7761de5d4e Merge "Manifest Fixer Params code refactor" 2022-02-10 18:22:30 +00:00
Treehugger Robot
49c83cf6f5 Merge "Use Tiramisu instead of T in supported_build_releases" am: 52aad81d45 am: fcb871ac39 am: 5bf9b0691e am: b45e3d7b1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1979466

Change-Id: Ie9a5421b8e38f0643c5ea78ce75cf38ae85c02a5
2022-02-10 17:14:57 +00:00
Gurpreet Singh
7deabfacd0 Manifest Fixer Params code refactor
This CL refactors the code related to ManifestFixer parameters.
The required parameters android.ModuleContext, manifest android.Path are
passed separately as the parameters and the optional parameters are
kept as part of the ManifestFixerParams struct.

By default, the member variable of struct have the zero (nil, false,
empty string) values. Hence, it is only required to pass the
parameters of interest at the time of function call to
ManifestFixer.

Manual testing done to check the working of the code.

Test: m nothing && m test_com.android.sdkext
Test: manually tested the generation of AndroidManifest in the out
directory with the testOnly attribute
Test: atest manifest_fixer_test --host
To test the existing unittests are not breaking.

Change-Id: I20cb6c06c57f8fe7811050288bcb03945dc0425b
2022-02-10 13:37:50 +00:00
Paul Duffin
e7babdbfe1 Use Tiramisu instead of T in supported_build_releases
Make this consistent with how code names are used in the rest of Soong.

Bug: 204763318
Test: m nothing
Change-Id: I1f2f40310df9d619db6aaaad3ed7339bb5e79194
2022-02-10 13:06:54 +00:00
Sam Delmerico
9f047d9f18 add support for java stream protos in protoDeps
The java module currently supports full, lite, micro, and nano protobuf
types, but it doesn't support the stream type. This commit fixes that.

Bug: 217241348
Test: go test ./java -run TestProto
Change-Id: Ifae51734103d424892b66da43ca51e7b6fbe45ba
2022-02-07 22:39:38 +00:00
Paul Duffin
3ed2d0e53c Merge "Add support for excluding libraries from class loader contexts" am: e95d77b964 am: ab9e6fe18f am: 7c89c48887 am: 10ccb6c274
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1971343

Change-Id: Ia03300d88199034f2cf07dbb9ca229e5e13ceb00
2022-02-07 18:39:48 +00:00
Paul Duffin
e95d77b964 Merge "Add support for excluding libraries from class loader contexts" 2022-02-07 17:52:27 +00:00
Treehugger Robot
cd814286bc Merge "Allow installing boot images outside of APEX for prebuilt." am: 210957500c am: fd08d7e9a5 am: 941eaf9fa1 am: cbe9579d13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1964908

Change-Id: I85428312f74919580a4c177d637f917cf6211639
2022-02-07 16:47:29 +00:00
Treehugger Robot
210957500c Merge "Allow installing boot images outside of APEX for prebuilt." 2022-02-07 15:58:36 +00:00
Paul Duffin
0653057603 Add support for excluding libraries from class loader contexts
A number of tests in the cts/tests/signature/api-check check for the
accessibility of classes from the android.test.base,
android.test.runner and android.test.mock libraries. Some tests expect
to find the classes other do not. Unfortunately, the tests use
libraries, specifically compatibility-device-util-axt, that depend on
the android.test... libraries which causes Soong to implicitly add
<uses-library> entries to the manifest so that they will be accessible
at runtime. That causes the tests that do not expect to find the
classes to fail.

Bug: 209607558
Test: m nothing
Change-Id: I54c194ab23d5a70df790ece3fe98f2b3d6a1c1f6
2022-02-07 14:57:53 +00:00
Sam Delmerico
67a4f2511b Merge "add target_compatible_with stanza for host targets" am: 75664acd70 am: c9c5269342 am: 608b32f41a am: d3b10485f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1966480

Change-Id: I521a6c7e2ef12516bebe06661086ebe3338a1bad
2022-02-04 20:15:02 +00:00
Sam Delmerico
75664acd70 Merge "add target_compatible_with stanza for host targets" 2022-02-04 19:15:04 +00:00
Romain Jobredeaux
a50778b117 Merge "Use common java library attributes for android_app bp2build converter." am: 99a81c8dfd am: abf2323829 am: 7b368117a6 am: 9be703df2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1969119

Change-Id: I49791f01bdeced17d8ce5964d7e170ef588b922a
2022-02-03 22:16:09 +00:00
Romain Jobredeaux
99a81c8dfd Merge "Use common java library attributes for android_app bp2build converter." 2022-02-03 21:09:26 +00:00
Sam Delmerico
75539d62ae add target_compatible_with stanza for host targets
Soong modules that are specific for the host platform (e.g.
java_library_host, cc_binary_host, java_genrule_host, etc.) should
not be built on the target platform (Android), so we add a
target_compatible_with attribute to skip this type of module on an
Android target build.

Bug: 215229742
Test: go test ./bp2build
Change-Id: Ifb76ef4e0dc4cb3adb6a64b5c375ce36f7973e48
2022-02-03 19:25:12 +00:00