Commit Graph

51170 Commits

Author SHA1 Message Date
Treehugger Robot
4bc5fbb974 Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed" am: 9c60cc4f22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081279

Change-Id: Id1959d92078cc2b32c7b0f8923bfc1209fdbf6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:07:51 +00:00
Christopher Parsons
b189af9c49 Merge "Preserve depset structure from bazel aquery" am: f485a95d3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075349

Change-Id: Iee1e5991dfebbbbee097e2fc5edc22567b7e552f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:07:41 +00:00
Paul Duffin
c06a700dcc Merge "hiddenapi: Prevent libraries for Q/R from include S+ flags." am: a09d95f605
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079360

Change-Id: I6c9be5da33d98f6883c5a3eec9864e63c628925a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:07:18 +00:00
Victor Chang
611f75ea9a Merge "Revert "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 99666e2720
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2081278

Change-Id: Ifb2fc1887977611dd9418ae59328717a304b056c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:10 +00:00
Treehugger Robot
e10bff239b Merge "Fix crash in MakeString.EndsWith()" am: 2fe7af01af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078144

Change-Id: I20b73335ebf22ed72b6196bd2df8eafdfbf2fc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:58 +00:00
Jooyung Han
b25e2382a3 Merge "Put rust_test.data_libs under lib[64]" am: fbcf7e1c91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080100

Change-Id: I8616b699116a636bfd76ef2072e6254a3269104c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:49 +00:00
Treehugger Robot
a72f626d9d Merge "Clean up min_sdk_version allowlist" am: 979a64f810
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076338

Change-Id: Ife17625626860dcbbf1ee8fda01eb08d1c62f55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:39 +00:00
Vinh Tran
f4b263c487 Merge "bp2build converts java_version property to javacopts attribute" am: 775b44fa50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072296

Change-Id: Ic0c085dfe91fb27fd33eeda4277a01c69723f06b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:28 +00:00
Treehugger Robot
4a83601c95 Merge "Update to clang-r450784e" am: 28881cbd55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078625

Change-Id: Ib7eebf491863f4863c4891d6700ef19db800cfe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:02:22 +00:00
Cole Faust
0aa41c796e Merge "Show load cycles when running mk2rbc" am: 01624a9c33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078147

Change-Id: Icb93a3a92b80b2f7e54425a9cbb29ce8edf7b4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:53 +00:00
Cole Faust
323d7af832 Merge "Recognize some unsupported functions" am: 2b6a312662
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077118

Change-Id: I996dc940bf7ed91681915bfb59d5dc69c1f0ab87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:36 +00:00
Treehugger Robot
91255a653f Merge "Prototype changes for multitree" am: 184a6b87e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076401

Change-Id: I9454e90eba0ed585fdbb9ca1b5041e88c8ec14d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:14 +00:00
Treehugger Robot
969d2b5af9 Merge "Convert $(words) to Starlark" am: f8c3412822
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073975

Change-Id: I2c27e33b81ba0ad1edc30eaea9134233f3afea16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:00:15 +00:00
Treehugger Robot
87089903c2 Merge "Use --dependency-file when linking elf files." am: ff22afa704
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975926

Change-Id: Ic3e05e629701597c79ce222e1b73ddbd0273b007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:00:06 +00:00
Paul Duffin
79c44417b0 Merge "Allow framework-media to build the framework-media.impl" am: fb14b52747
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359

Change-Id: If34a3316c996a40ca0390b3858e589e85681e925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:59:55 +00:00
Treehugger Robot
9c60cc4f22 Merge "java_sdk_library_import: Delegate OutputFiles to impl library if needed" 2022-04-29 17:27:23 +00:00
Christopher Parsons
f485a95d3a Merge "Preserve depset structure from bazel aquery" 2022-04-29 14:49:31 +00:00
Paul Duffin
1e940d5b44 java_sdk_library_import: Delegate OutputFiles to impl library if needed
Bug: 230846030
Test: m nothing
      # Cherry pick into build with prebuilts enabled to verify.
Change-Id: I5ac9b1cdd2fc61efbc988e84556202ff6cd57146
2022-04-29 14:42:04 +01:00
Paul Duffin
a09d95f605 Merge "hiddenapi: Prevent libraries for Q/R from include S+ flags." 2022-04-29 13:37:35 +00:00
Victor Chang
99666e2720 Merge "Revert "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" 2022-04-29 10:34:41 +00:00
Nataniel Borges
5d80d895b6 Revert "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"
This reverts commit 8b7f627f30.

Reason for revert: b/230821289

Change-Id: I3032103b174c78586b38b64d2748ec5a42fa9522
2022-04-29 09:49:16 +00:00
Treehugger Robot
2fe7af01af Merge "Fix crash in MakeString.EndsWith()" 2022-04-29 08:18:05 +00:00
Jooyung Han
fbcf7e1c91 Merge "Put rust_test.data_libs under lib[64]" 2022-04-29 04:00:13 +00:00
Treehugger Robot
979a64f810 Merge "Clean up min_sdk_version allowlist" 2022-04-29 02:22:24 +00:00
Vinh Tran
775b44fa50 Merge "bp2build converts java_version property to javacopts attribute" 2022-04-29 01:43:20 +00:00
Treehugger Robot
28881cbd55 Merge "Update to clang-r450784e" 2022-04-29 01:00:33 +00:00
Cole Faust
01624a9c33 Merge "Show load cycles when running mk2rbc" 2022-04-29 00:44:12 +00:00
Cole Faust
2b6a312662 Merge "Recognize some unsupported functions" 2022-04-29 00:41:15 +00:00
Jooyung Han
10bea7d44a Put rust_test.data_libs under lib[64]
Rust test binary depending on native libraries would require them under
lib[64] directory so that the test binary can open them with default
rpath values.

Bug: 204562227
Test: presubmit
Change-Id: I029bb32c4c98fba21bd28e579a9df9f184a7f045
2022-04-28 23:55:43 +00:00
Cole Faust
35b994e1e7 Fix crash in MakeString.EndsWith()
Bug: 226974242
Test: go test
Change-Id: I21ff26d00ed7be145ae2c1175f1438b6e7d60834
2022-04-28 16:08:02 -07:00
Vinh Tran
3ac6daf47c bp2build converts java_version property to javacopts attribute
This CL also converts `external/rappor` (which already set `java_version` to `1.7`) to be bazelable to testify the changes.

Results from `b build //external/rappor && cat bazel-bin/external/rappor/librappor.jar-0.params`: https://paste.googleplex.com/5518725462622208.

Test: go test ./bp2build/...
Bug: 227618664
Change-Id: I8d370d4639f70fba51e6de6ceb7bcb5ace9ccd91
2022-04-28 18:52:48 -04:00
Treehugger Robot
184a6b87e5 Merge "Prototype changes for multitree" 2022-04-28 22:20:47 +00:00
Treehugger Robot
f8c3412822 Merge "Convert $(words) to Starlark" 2022-04-28 22:18:07 +00:00
Treehugger Robot
ff22afa704 Merge "Use --dependency-file when linking elf files." 2022-04-28 22:14:54 +00:00
Paul Duffin
fb14b52747 Merge "Allow framework-media to build the framework-media.impl" 2022-04-28 21:10:16 +00:00
Cole Faust
b52f187a22 Merge "Allow seeing include $(x) when there is an include_top comment" am: 16bb2d044d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076911

Change-Id: Ie6a0c47b3fc54b4779da621c4eba16ae169e0074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:50:45 +00:00
Treehugger Robot
c16665bc17 Merge "Convert includes/inherits inside evals" am: e8f19f3dd7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073866

Change-Id: I05fe227917386a325f86f83a70b80f404bf4eab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:50:34 +00:00
Cole Faust
16bb2d044d Merge "Allow seeing include $(x) when there is an include_top comment" 2022-04-28 20:49:17 +00:00
Treehugger Robot
e8f19f3dd7 Merge "Convert includes/inherits inside evals" 2022-04-28 20:43:29 +00:00
Kousik Kumar
e4b4c45bf2 Merge "Add a warning message about missing gcert at the end of the build" am: 4e3c26602f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078459

Change-Id: I8274f0a1602d86d896ebebafa03635c4618647d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:40:57 +00:00
Cole Faust
a27ee862e2 Merge "Allow comparing $(wildcard) results to non-empty values" am: 1a3e5effa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075735

Change-Id: I10f1ed3fc07de5ca14640a877801107a2cb9184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:40:36 +00:00
Kousik Kumar
4e3c26602f Merge "Add a warning message about missing gcert at the end of the build" 2022-04-28 19:55:30 +00:00
Cole Faust
1a3e5effa8 Merge "Allow comparing $(wildcard) results to non-empty values" 2022-04-28 19:54:32 +00:00
Paul Duffin
09817d66de hiddenapi: Prevent libraries for Q/R from include S+ flags.
The Q and R runtimes can handle Q/R flags but not S flags. So, this
change verifies that any library that can run on Q/R
(min_sdk_version <= R) by adding --max-hiddenapi-level=max-target-r
to the "hiddenapi encode" command. That will cause a failure if any
S+ flags are found in the flags to encode.

Bug: 172453495
Test: m droid && launch_cvd
      Cherry pick changes in https://r.android.com/q/topic:max-target-s
      Add @UnsupportedAppUsage maxTargetSdk=S in classes in framework-permission (for r/q)
      and framework-permission-s (nominally for S+). I had to incresed the min_sdk_version
      in the latter to 31 (S) as it was still set at 30 (R).
Change-Id: Ie0f68482603adc7b4e3d7a5c81bf203d81a84a9e
2022-04-28 18:34:48 +01:00
Treehugger Robot
705d009fbb Merge "Set the dist dir for musl targets of build_version_test" am: f7fa021b65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079658

Change-Id: Id1cbde34a306e9b2b120a3b198cb1442ab736cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 16:58:46 +00:00
Treehugger Robot
63015df873 Merge "Correctly serialize class loader context for "any" SDK version to JSON." am: 1b60bb4fe1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077659

Change-Id: I7ee478d26bb7741a6d75a8ba0f668a3d9bb8622f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 16:58:05 +00:00
Treehugger Robot
f7fa021b65 Merge "Set the dist dir for musl targets of build_version_test" 2022-04-28 16:51:24 +00:00
Chris Parsons
1a7aca075b Preserve depset structure from bazel aquery
Each depset now corresponds to a phony rule which depends on other
depsets or on full paths; thus, bazel's depset structure is preserved in
the form of phony rules of name bazel_depset_{id}.

Previously, flattening and recopying large lists of file path strings
was quite inefficient. This was particularly evident as we enumerated
hundreds of clang headers for each cc compile action.

This reduces soong_build analysis time by about 30% for mixed builds.
It also reduces ninja file size by ~750MB.

Fixes: 229405615
Test: Unit tests, manually verified metrics, mixed_droid CI

Change-Id: I78df152ac1488ae0c6807afdde4b4ad5e6d26287
2022-04-28 12:44:28 -04:00
Treehugger Robot
1b60bb4fe1 Merge "Correctly serialize class loader context for "any" SDK version to JSON." 2022-04-28 15:46:04 +00:00
Paul Duffin
77590a8263 Allow framework-media to build the framework-media.impl
The framework-media java_sdk_library is currently api_only for legacy
reasons. This change allows it to also build the framework-media.impl
library by making the following changes:
* Adds impl_only_static_libs to allow the implementation to statically
  include other libraries, something no other java_sdk_library has
  needed to do.
* Passes the apex_availability property through to the impl library so
  it can be statically included in the updatable-media which is what is
  included in the apex, again for legacy reasons.

Bug: 190807367
Bug: 229932396
Test: m com.android.media media-module-sdk
      # Compare before and after this change (and corresponding change
      # to updatable-media/framework-media.
Change-Id: I9e1837edcca6f5fa84fc611274cf8fbba8a896b8
2022-04-28 14:30:14 +00:00