Commit Graph

51303 Commits

Author SHA1 Message Date
Treehugger Robot
9bc494bc08 Merge "Ensure that *bootclasspath* module types depend on device variants" am: 1a6305f9e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095251

Change-Id: Idd2936bb753856c411a1753474671f39baca33f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:44:22 +00:00
Treehugger Robot
ff063f97fd Merge "convert java_resources with bp2build" am: 2737c25e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042845

Change-Id: I917f7114637e0439f22be9d9d6c2521ed9c1d2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:44:12 +00:00
Sorin Basca
12dd25adda Merge "Strip annotations from library stubs" am: 61c6eef064
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092623

Change-Id: Ifd82d1e8dd7c30ebafa65c0a3ccfd814ff833e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:43:45 +00:00
Treehugger Robot
1a6305f9e0 Merge "Ensure that *bootclasspath* module types depend on device variants" 2022-05-11 20:43:30 +00:00
Anton Hansson
17094ecba8 Merge "Use lint database from api_versions_public" am: b82b392423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092228

Change-Id: I55f152512459b043ab00996befa8a584f3ad9f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:41:59 +00:00
Spandan Das
e41be189f0 Merge changes Ie8881b85,I6c064f8a am: f923333a93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090231

Change-Id: I3072b020c2612b7e612aee4c88cf2ab774fecaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:40:13 +00:00
Chih-hung Hsieh
302ce27825 Merge "no out/soong/... in default header-filter" am: c275b81fc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092485

Change-Id: Id3731511b39d957f597dc1c6ddb5580ba19a39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:39:48 +00:00
Anton Hansson
63c05717b3 Merge "Support using api-versions.xml from another module" am: 4d92d831ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092227

Change-Id: Iddb9921f18786a6058efe6f77721bf50cb677a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:39:16 +00:00
Anton Hansson
58729fada2 Merge "Use merged annotations zip for lint" am: 3881e8d7fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092226

Change-Id: Ic12c9456d9bdea7addee0ece81cdd0317b40f623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:44 +00:00
Anton Hansson
adfab19c93 Merge "Write AndroidMk for api-versions.xml module" am: 55c157791e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092225

Change-Id: Ic4f89a42241988ba7b318e425b5173d5d49117c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:16 +00:00
Treehugger Robot
4f1ca80323 Merge "Support complicated variable references" am: b1263eef55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080719

Change-Id: I07ca28a110c132d6768765ab0720b3b42e37a144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:03 +00:00
Wei Li
2ba896659d Merge "Export attestation file information to provenance metadata of an artifact if its attestation file exists." am: 8b9c23ec2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086465

Change-Id: Ie7aeaf8765d4ad54bc3474de997e32c1baa55543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:38 +00:00
Cole Faust
08f458e771 Merge "Flatten foreach calls that produce 2d lists" am: 85f8fa2c20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2088145

Change-Id: Icfa7556077990abff11022998d5e841fcc06d06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:14 +00:00
Chih-hung Hsieh
28ddfd918b Merge "Disable performance-no-int-to-ptr in global default" am: 63d5ba23ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092585

Change-Id: I6552a60861486d6a75b8a4a8eb2f15ecd5e82614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:19:30 +00:00
Treehugger Robot
635fdabe3e Merge "Reland "Update to clang-r450784e"" am: 5554b0e276
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2093183

Change-Id: Icb6b5c977047edc81f880008a97990055998803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:19:20 +00:00
David Brazdil
f534a3e78d Add binary_test.cc to testSrcs am: 979ef5bb2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092068

Change-Id: Ia85360419c1ce53315ee68d8feaab4e87067d18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:18:51 +00:00
David Brazdil
8cb745ae7a Fix test compilation error am: 3ac9d2bf23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092067

Change-Id: I43f80c5ef83c409be870c7317288236dce028341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:18:39 +00:00
Treehugger Robot
2737c25e9e Merge "convert java_resources with bp2build" 2022-05-11 19:58:48 +00:00
Paul Duffin
b2c2173bfd Ensure that *bootclasspath* module types depend on device variants
Needed to allow change https://r.android.com/2089503 to be reapplied.

Bug: 232106778
Test: Apply the change and then run
      m EMMA_INSTRUMENT=true nothing
Change-Id: I92d19c51cc828295ba13951e65911db707f0f2ba
2022-05-11 15:20:37 +00:00
Sorin Basca
61c6eef064 Merge "Strip annotations from library stubs" 2022-05-11 13:46:25 +00:00
Anton Hansson
b82b392423 Merge "Use lint database from api_versions_public" 2022-05-11 08:11:45 +00:00
Sorin Basca
69f4b082b9 Strip annotations from library stubs
Bug: 222743634
Test: m
Change-Id: Ic44bd7c4c163b723295eb369664432d3651b8597
2022-05-10 19:41:59 +01:00
Spandan Das
f923333a93 Merge changes Ie8881b85,I6c064f8a
* changes:
  Enforce updatable=true on apps of updatable apexes
  Update sdk_version check for jni_libs of updatable apps
2022-05-10 18:20:27 +00:00
Chih-hung Hsieh
c275b81fc7 Merge "no out/soong/... in default header-filter" 2022-05-10 17:43:16 +00:00
Sam Delmerico
79985819fe convert java_resources with bp2build
Test: b build --platforms=//build/bazel/platforms:linux_x86
  //external/jarjar:jarjar-binary and try to use on a jar
Change-Id: Id6f4e6937687fd575360fbacaeda55c41922636e
2022-05-10 14:32:52 +00:00
Anton Hansson
4d92d831ca Merge "Support using api-versions.xml from another module" 2022-05-10 13:40:26 +00:00
Anton Hansson
3881e8d7fb Merge "Use merged annotations zip for lint" 2022-05-10 10:31:27 +00:00
Anton Hansson
55c157791e Merge "Write AndroidMk for api-versions.xml module" 2022-05-10 09:39:35 +00:00
Treehugger Robot
b1263eef55 Merge "Support complicated variable references" 2022-05-10 09:05:32 +00:00
Chih-Hung Hsieh
5fe637aadb no out/soong/... in default header-filter
* There are too many warnings from out/.../*.pb.h
  and other generated header files.

Bug: 180862582
Bug: 231245501
Test: WITH_TIDY=1 make
Change-Id: Ibabc1040666b50c6dec4fd66ae999a3441324fbd
2022-05-10 01:27:42 -07:00
Wei Li
8b9c23ec2d Merge "Export attestation file information to provenance metadata of an artifact if its attestation file exists." 2022-05-10 06:14:34 +00:00
Cole Faust
1323877b7e Support complicated variable references
Bug: 226974242
Test: go test
Change-Id: Iaec16f5c498e7c75c9ee5d53d3499efadfba16bc
2022-05-10 05:26:35 +00:00
Cole Faust
85f8fa2c20 Merge "Flatten foreach calls that produce 2d lists" 2022-05-10 05:26:03 +00:00
Chih-hung Hsieh
63d5ba23ea Merge "Disable performance-no-int-to-ptr in global default" 2022-05-10 05:17:29 +00:00
Treehugger Robot
5554b0e276 Merge "Reland "Update to clang-r450784e"" 2022-05-10 02:46:52 +00:00
Wei Li
b68b3675fd Export attestation file information to provenance metadata of an artifact if its attestation file exists.
Bug: 231239599
Test: m provenance_metadata
Test: atest --host gen_provenance_metadata_test
Change-Id: I6c53d7713874c9b2fd8a422b030b7c8d23317f5b
2022-05-10 02:24:43 +00:00
Spandan Das
42e89508ee Enforce updatable=true on apps of updatable apexes
- Update apex_info (a topdown mutator) so that it sets updatable=true on
  apps of updatable apexes
- Write a unit test that tests different combinations of
  updatable/non-updatable apks-in-apexes
- Update an existing unit test that asserts a different error

Test: go test ./java
Test: m nothing (in internal)
Bug: 209409604

Change-Id: Ie8881b857afcec44addf27fc360c5b8abf726bd2
2022-05-10 00:01:34 +00:00
Chih-Hung Hsieh
5d46cd396e Disable performance-no-int-to-ptr in global default
* This tidy check is too noisy,
  with more than 5000 cases over many files.

Bug: 218759304
Test: make tidy_soong_subset
Change-Id: I8a4b2589ecafdfcd9c19e8a4d59ce1784d1be694
2022-05-09 16:01:10 -07:00
Stephen Hines
7a2a9967b1 Reland "Update to clang-r450784e"
This reverts commit fbc5effdfd.

Bug: http://b/197965342
Bug: http://b/230930120
Test: m and also test internal targets
Change-Id: I49b2d80ef4191ebb08bb6e80507042ee628c7f09
Merged-In: I49b2d80ef4191ebb08bb6e80507042ee628c7f09
2022-05-09 15:52:10 -07:00
Cole Faust
72374fc628 Flatten foreach calls that produce 2d lists
In make, the result of $(foreach $(x),$(y),$(foreach $(z),(w),a))
is a regular list, but in Starlark it's a list of lists. Flatten
the results of foreach expressions where each element is a list
so that they're regular lists of strings again.

Bug: 226974242
Test: go test
Change-Id: I3210d409aba0d807a5890e341ab1e0c0478f5930
2022-05-09 22:47:34 +00:00
David Brazdil
979ef5bb2a Add binary_test.cc to testSrcs
Bug: 231700648
Test: m
Change-Id: If6161b2475887a6d40547f258ccb360c6d719b7a
2022-05-09 23:11:22 +01:00
David Brazdil
3ac9d2bf23 Fix test compilation error
Bug: 231700648
Test: include 'binary_test.go' in 'cc/Android.bp' and build
Change-Id: Ie09ae5c754753751a450fe8854d5c8743afc2e72
2022-05-09 19:36:04 +01:00
Lukács T. Berki
5c07e0b5bb Merge "Add comments for path_interposer." am: f2d126b3d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089086

Change-Id: Ic1840d51eb5026f3a4cf0d708f2ebdd34465ad94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:05:33 +00:00
Lukács T. Berki
f2d126b3d8 Merge "Add comments for path_interposer." 2022-05-09 15:48:57 +00:00
Paul Duffin
6a18c1e0eb Merge "For each sdk built generate a JSON file describing its contents" am: 1b543097ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089085

Change-Id: Ic1a3949c0fd39883bd31b3624f055116656deb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:19:54 +00:00
Artur Satayev
adddceb323 Merge "Add support to max-target-s to generate_hiddenapi_lists" am: b8f3f18c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2087008

Change-Id: I0de676a28cec24a5e2325e2df4c6d5150e602539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:16:36 +00:00
Paul Duffin
1b543097ac Merge "For each sdk built generate a JSON file describing its contents" 2022-05-09 13:51:11 +00:00
Anton Hansson
67cf60e7c5 Use lint database from api_versions_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Bug: 187398174
Test: diff api-versions.xml
Change-Id: I0fa35d4067bc06936b4a31bda0bca7fd41f26aae
2022-05-09 13:10:24 +00:00
Anton Hansson
c04a16ef0b Support using api-versions.xml from another module
Metalava has two different flags surrounding api-levels:
- one for generating api-versions.xml to a file
- one for applying api-versions.xml from a file

Previously, soong always applied both of these arguments at the same
time, such that framework-doc-stubs both generated and applied
api-versions.xml.

Add support for using api-versions.xml from another module name as well.

Bug: 187398174
Test: droidstubs_test.go
Change-Id: I8288fe4788336d5d5c60d09d48b00ca111449fba
2022-05-09 12:18:17 +00:00
Anton Hansson
ea17a45c26 Use merged annotations zip for lint
The framework-doc-stubs annotations.zip is no longer the correct
zip to use after b/187397779. It doesn't contain the module annotations.

Test: presubmit
Change-Id: I50e0bcc026c97886a31256e2387632c19d4b287f
2022-05-09 10:26:58 +00:00