Commit Graph

66239 Commits

Author SHA1 Message Date
Sorin Basca
5498faf505 Merge "Revert^2 "Add exports needed for Doclava"" 2023-06-12 14:53:14 +00:00
Joe Onorato
02a6e75913 turn off log spew
Test: treehugger
Change-Id: I5d053fb0e967ff08588fc17df3434e0660c88187
2023-06-10 14:36:17 -07:00
Yu Liu
ce8670a392 Merge "bp2build data property -> data attr in gensrcs" am: 86c7300bf3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2621008

Change-Id: I8c9a1f038042c5c699d919c919eaf9c34850936b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 04:31:33 +00:00
Yu Liu
b9d5e907bf Merge "Add property data to gensrcs for additional inputs" am: 268926aaaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2621007

Change-Id: I6f102ef78d043bec1f6b4d54c259ca3aef2a3ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 04:30:46 +00:00
Yu Liu
86c7300bf3 Merge "bp2build data property -> data attr in gensrcs" 2023-06-10 03:54:11 +00:00
Yu Liu
268926aaaa Merge "Add property data to gensrcs for additional inputs" 2023-06-10 03:53:52 +00:00
Treehugger Robot
73daae6519 Merge "Read BUILD files in bp2build" am: 01f8784246
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617569

Change-Id: I890438dbb170523db0b6379e2c2f27e9b83e7f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:26:54 +00:00
Treehugger Robot
01f8784246 Merge "Read BUILD files in bp2build" 2023-06-09 22:42:39 +00:00
Treehugger Robot
bd87bc6121 Merge "Add feature to print output paths for module" am: cbe72299ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620991

Change-Id: If03387e63d26fe62cfbe3f3ff9bdb8b1380249fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 19:42:48 +00:00
Treehugger Robot
e5c4b382d2 Merge "Make genrule sandbox script a python script" am: 7cb703fb99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620990

Change-Id: Iaf7243f905f2ef922fa69aef5fcf492c28160f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 19:42:38 +00:00
Cole Faust
0887a3c28a Merge "Remove --noexperimental_platform_in_output_dir" am: 466975575b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620726

Change-Id: Ia446a1abca478a8ba90f83e31e0650ea6777a7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 19:42:28 +00:00
Joe Onorato
c2ac7e89b1 Make aconfig flags generate a library instead of a srcjar. am: 175073c472
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611898

Change-Id: I4cf5b02e527233ad55d4a194cc22581d974cc64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 19:41:32 +00:00
Liz Kammer
8bd92429e5 bp2build data property -> data attr in gensrcs
Test: go test bp2build tests
Change-Id: I2192cf9846a5783385397337d40cca85a1ef73e7
2023-06-09 15:37:45 -04:00
Treehugger Robot
cbe72299ce Merge "Add feature to print output paths for module" 2023-06-09 19:34:00 +00:00
Treehugger Robot
7cb703fb99 Merge "Make genrule sandbox script a python script" 2023-06-09 19:32:11 +00:00
Liz Kammer
81fec18a5e Add property data to gensrcs for additional inputs
This enables sandboxing for inputs that are necessary but do not need to
have a source file generated.

Test: GENRULE_SANDBOXING=true m framework-javastream-protos \
      framework-cppstream-protos
Change-Id: Id5ca1dab5799c25fa96b564a7d2008c2e7b5382b
2023-06-09 15:29:32 -04:00
Cole Faust
466975575b Merge "Remove --noexperimental_platform_in_output_dir" 2023-06-09 19:25:15 +00:00
Ivan Lozano
61c02cc537 rust: Bundle Rust shared dependencies in fuzzers
Rust shared library dependencies are not always bundled in cc_fuzz or
rust_fuzz modules, which can lead to difficult to debug runtime errors
when running these fuzzers. It can also be hard to determine which
dependencies need to be explicitly declared.

This CL makes sure that we bundle the appropriate transitive
dependencies for our fuzzers.

Bug: 249551848
Test: Soong tests
Test: m <fuzzer> # check data/fuzz/<arch>/lib dir contents
Change-Id: I957ca8898079b61e2ff20d750f8c92bf61ac394f
2023-06-09 14:17:49 -04:00
Chris Parsons
8152a94816 Read BUILD files in bp2build
The parsed BUILD files will be scanned for obvious definitions of BUILD
targets which have Android.bp counterparts. In such cases, bp2build will
automatically omit conversion of these defined modules (to prevent
collisions). With this change, we no longer need one-off denylisting of
modules which have BUILD file definitions.

This has a 0.03s to 0.2s slowdown for bp2build with current state. This
impact is identical on a heavier test branch, as well. I also ran an
experiment that applied BUILD scanning to all source BUILD files
(regardless of allowlisting), and this had a 2 second slowdown.

We may want to look into parallelizing or improving the performance of
this evaluation, but it's probably not worth the effort at this time,
since the current performance hit is small.

Test: New integration test
Test: Removed libprotobuf-python from denylist and tested building the
package
Test: Treehugger

Change-Id: Ibde3bab12cd4a8fed642ad46e5344a56953bec91
2023-06-09 16:02:40 +00:00
Liz Kammer
2fb361cfb8 Add feature to print output paths for module
Test: ./genrule_sandbox_test.py -o gen_fstab.gs201 \
    libbt_topshim_bridge_header \
    android-support-multidex-instrumentation-version
Change-Id: Ied74d727054a1bc3b447c1f10a4ee41b3fdfdf1d
2023-06-09 11:31:28 -04:00
Liz Kammer
767fad4b05 Make genrule sandbox script a python script
Unfortunately, genrules are not always available with `m`, instead we
need to know their output paths in order to build them and diff them.
Rewriting in Python lets us store module:output path maps more easily.

Test: ./genrule_sandbox_test.py gen_fstab.gs201 \
      libbt_topshim_bridge_header \
      android-support-multidex-instrumentation-version
Change-Id: If74130e5a4381cc0e1fab396ebb90dfd5a595a1c
2023-06-09 11:31:08 -04:00
Joe Onorato
175073c472 Make aconfig flags generate a library instead of a srcjar.
Also add unit tests for the rest of device_config

Bug: 283475679
Test: m nothing (soong unit tests)
Change-Id: Iee18a1f2f2cbb23e8c8d84c54e903b32be29a693
2023-06-09 06:16:06 -07:00
Sorin Basca
a7b777f800 Revert^2 "Add exports needed for Doclava"
a39209b565

Change-Id: Ib7c674e5142d2dff719d14092ac5383b6484d54c
2023-06-09 09:19:36 +00:00
Yi Kong
22c0870729 Merge "Refactor LTO" am: f1d37b3511
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2619271

Change-Id: I1472861f48b91d802df54227bca5914c31761bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 03:29:56 +00:00
Treehugger Robot
88d9189d1b Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" am: 5950b039b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620713

Change-Id: Ic3ac53f07d29683eae9ed34ae5279f5d4a35bb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 03:29:46 +00:00
Yi Kong
f1d37b3511 Merge "Refactor LTO" 2023-06-09 03:16:22 +00:00
Yi Kong
895d241013 Refactor LTO
We removed Full LTO support, now LTO is a binary choice. This allows us
to greatly simplify the LTO propagation logic.

Test: m
Test: GLBOAL_THINLTO=true m
Bug: 169004486
Change-Id: Ie4e453d7518c7069a7c755734dab1e776c16e656
2023-06-09 03:15:49 +00:00
Treehugger Robot
5950b039b3 Merge "Revert "mk2rbc: temporarily bump matching paths limit to 155. "" 2023-06-09 02:44:09 +00:00
Cole Faust
4b469ec3aa Merge "Allowlist build_image and its dependencies" am: f1815ea326
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2620500

Change-Id: I29a8b14d27a61fcb36f346794b3db0b78db36706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 01:08:28 +00:00
Cole Faust
319abae1c7 Remove --noexperimental_platform_in_output_dir
This is a followup to aosp/2606989.

This flag is not necessary now that we're using one platform name
for all of mixed builds.

Also rename current_product to mixed_builds_product so that it's clear
that that this platform should only be used for mixed builds.

In addition, make the bazelrc files point to the named products again
instead of the mixed build product so that b builds will still have
qualified outputs, but mixed builds won't.

Test: Presubmit and kernel build tools abtd run
Change-Id: I7f764cf42cd1323f4b495d1320931f59a076ac63
2023-06-08 17:58:35 -07:00
Cole Faust
f1815ea326 Merge "Allowlist build_image and its dependencies" 2023-06-09 00:29:27 +00:00
Treehugger Robot
2f69d2adfb Merge changes from topic "cc_stem" am: f253d23e95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609265

Change-Id: I2eb1f21da7a4b146df85c37a1223be29c0ed4c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:32:42 +00:00
Vinh Tran
8106bd0b00 Revert "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp"
This reverts commit 2562585878.

Reason for revert: We now have aidl_library to remove this workaround to support specifying aidl headers

Change-Id: Idf03ebbea764f8c5b3c4fc1623f8f02aa321c8c1
2023-06-08 23:29:18 +00:00
Cole Faust
8ff3c63376 Revert "mk2rbc: temporarily bump matching paths limit to 155. "
This reverts commit 30d48351be.

Reason for revert: The underlying issue was fixed in ag/23603641

Change-Id: Ibe2749c3bb7412132de6d96d178f54cd8d1d0666
2023-06-08 22:53:16 +00:00
Treehugger Robot
f253d23e95 Merge changes from topic "cc_stem"
* changes:
  Remove modules from denylist
  Update runpath for jni libs
  bp2build support for stem
2023-06-08 22:38:34 +00:00
Cole Faust
17cd19c040 Allowlist build_image and its dependencies
Bug: 265127181
Test: Presubmits
Change-Id: Idd8508cd2ca549c75d918635b7eef36c8edd2ba0
2023-06-08 12:26:42 -07:00
Aditya Kumar
74ee1e97ad Merge "[RISC-V] rv64gc_zbb for Android" am: 9d1a17d18a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617535

Change-Id: I45f56d67d8a3bbcd09cf91cfe6df614d7eaa5f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:42:54 +00:00
Himanshu Rawat
a2beb1cc43 Merge "Revert "Add exports needed for Doclava"" am: 4ead3a807d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617527

Change-Id: I3b76daf7ad432bcfe37089b905048f24c2a72e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:41:44 +00:00
Treehugger Robot
e1e90c7702 Merge "Reclassify OFL as notice per cl/537072410" am: 087642b8d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611894

Change-Id: If513bb050e2cdf6bf2983f965c2130a6009a4581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 17:39:02 +00:00
Aditya Kumar
9d1a17d18a Merge "[RISC-V] rv64gc_zbb for Android" 2023-06-08 17:12:26 +00:00
Himanshu Rawat
4ead3a807d Merge "Revert "Add exports needed for Doclava"" 2023-06-08 16:45:02 +00:00
Treehugger Robot
087642b8d2 Merge "Reclassify OFL as notice per cl/537072410" 2023-06-08 16:33:00 +00:00
Treehugger Robot
ee54f2c766 Merge "Add exports needed for Doclava" am: 02761e58a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617009

Change-Id: I8ed627f161e34e84c1ebebb0b86e8cb27cb1244e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:13:47 +00:00
Mårten Kongstad
3d8b6c4fc4 Merge "Change aconfig parameter from --namespace to --package" am: ab76e26ac8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2607229

Change-Id: I866dacfda7d75a186c55f55c97e6019fccd9d6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:13:25 +00:00
Himanshu Rawat
a39209b565 Revert "Add exports needed for Doclava"
Revert submission 2615972-b-270335653-doclava-search-imports

Reason for revert: DroidMonitor: Potential culprit for Bug 286398320 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Reverted changes: /q/submissionid:2615972-b-270335653-doclava-search-imports

Change-Id: Ibc3bdb301110b564e1427432a1b530e07bb840cd
2023-06-08 16:12:31 +00:00
Treehugger Robot
02761e58a0 Merge "Add exports needed for Doclava" 2023-06-08 15:35:48 +00:00
Mårten Kongstad
ab76e26ac8 Merge "Change aconfig parameter from --namespace to --package" 2023-06-08 15:12:10 +00:00
Treehugger Robot
f8e5110991 Merge "Revert "Remove --noexperimental_platform_in_output_dir"" am: ca69a6fc21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617276

Change-Id: I2e1695ee5e15f995c233b5bc773021cac104034d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 12:43:00 +00:00
Treehugger Robot
ca69a6fc21 Merge "Revert "Remove --noexperimental_platform_in_output_dir"" 2023-06-08 12:10:14 +00:00
Matthias Männich
08ccec7c11 Revert "Remove --noexperimental_platform_in_output_dir"
This reverts commit 24af24e0f2.

Reason for revert: Breaks kernel build tools build https://ci.android.com/builds/branches/aosp_kernel-build-tools/grid?head=10282004&tail=10282004

Change-Id: I486d7f305d44cfecc51a0e039cc41c0afa6495f3
2023-06-08 08:19:14 +00:00