Commit Graph

66239 Commits

Author SHA1 Message Date
Sam Delmerico
717840fdfc Merge changes from topic "privapp_allowlist_prop"
* changes:
  add privapp_allowlist property to android_app
  Add script for modifying privapp permission allowlists
2023-05-04 13:57:17 +00:00
Liz Kammer
a7bea31bee Allowlist test_com.android.media.swcodec
Test: b build --config=android test_com.android.media.swcodec
Change-Id: I6fa18f8739c476ec6d5c8a09681e7acc74bf463c
2023-05-04 09:51:56 -04:00
Jiakai Zhang
7b845e808f Generate app profiles even if dexpreopt is disabled.
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. lunch aosp_cf_x86_64_phone-userdebug && m
  3. See app profiles still generated.
Test: -
  1. Patch ag/20592051 to enable profile for service-art.
  2. banchan com.android.art x86_64 && m
  3. See the profile for service-art generated.
Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
2023-05-04 13:53:22 +01:00
Jeongik Cha
73d491196b Measure 'ninja_hint' time
Bug: 273282046
Test: m nothing and check out/soong_build_metrics.pb
Change-Id: I6440c3279b141c1f057145b668f8b96c45eaa75d
2023-05-04 18:16:11 +09:00
Treehugger Robot
0aba2074d7 Merge "Allowlist SBOM generation tool so it can be used in Bazel." am: fa1334ecdf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2566174

Change-Id: Ib93561f6d7450d6a53c8c85c22118676f5af8faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:34:34 +00:00
Treehugger Robot
fa1334ecdf Merge "Allowlist SBOM generation tool so it can be used in Bazel." 2023-05-04 06:23:00 +00:00
Jeongik Cha
0ac807f782 Merge "Use module type, size of srcs or deps to prioritize module" am: 291cc5f9d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2525588

Change-Id: I767586858647f9e0415a66398a323376e31d808b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:14:00 +00:00
Cole Faust
7b8e056494 Remove "dumping rbe metrics" message am: 0428f71b30
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577994

Change-Id: I19f38dd4e661687661afd50804f4249f920f949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:13:42 +00:00
Jeongik Cha
291cc5f9d9 Merge "Use module type, size of srcs or deps to prioritize module" 2023-05-04 06:10:32 +00:00
Jooyung Han
ebaa573317 Prebuilt replacing source should not change partition
This reveals unintended mistake (setting a wrong target partition) at
build-time instead of runtime, which is much harder to debug.

Bug: 280368661
Test: m nothing (soong test)
Change-Id: Ic5e5e97ba918e24f7a59aceb405c2b105e28cccc
2023-05-04 10:36:27 +09:00
Cole Faust
0428f71b30 Remove "dumping rbe metrics" message
The issue where RBE was taking a long time has been fixed, so this
message isn't that important anymore, and it was overriding the last
ephemeral status message that soong output.

Test: Presubmits
Change-Id: I019f351a3307176ec7b4786d4387fde9061ba08b
2023-05-03 18:21:05 -07:00
Wei Li
74e3e00314 Allowlist SBOM generation tool so it can be used in Bazel.
Bug: 275472038
Test: b build //build/make/tools/sbom:generate-sbom && bazel-out/aosp_cf_x86_64_phone-userdebug_linux_x86_64-opt/bin/build/make/tools/sbom/generate-sbom
Change-Id: I4ad68b0613410f40c79ee24d3eef779c2ad57815
2023-05-03 15:48:51 -07:00
Treehugger Robot
26870cd0fe Merge "Prevent sh_test from migrating as sh_binary" am: acb7f7a7ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2573092

Change-Id: Ib77a48ff39897efec7187f54ee500c39f2ec3f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:01:56 +00:00
Treehugger Robot
acb7f7a7ce Merge "Prevent sh_test from migrating as sh_binary" 2023-05-03 20:26:58 +00:00
Liz Kammer
aa553b1a4c Merge "Correct allowlisting for override modules" am: 46cd7d3be7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2573094

Change-Id: Ia89be33fab11cdaab61b955de6436249969f03b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 15:52:46 +00:00
Andrei Onea
580636bdd2 add privapp_allowlist property to android_app
This change allows override_android_app to use the same
privapp_allowlist as the non-override module so that they will always
remain in sync.

Test: go test ./java -v -run TestPrivappAllowlist
Test: go test ./apex -v -run TestApexWithApps
Test: m com.android.permission com.google.android.permission and verify
  manually that apex_payload.img contains correct privapp_allowlist
Test: m com.android.permission before and after change &&
  `diffoscope apex_payload_reference.img apex_payload_with_change.img`
  && verify that there are no semantic changes
Bug: 242509786
Change-Id: Ifdcb28af40763aed7a4aac9a7f681153554bc256
2023-05-03 15:03:34 +00:00
Liz Kammer
46cd7d3be7 Merge "Correct allowlisting for override modules" 2023-05-03 14:58:31 +00:00
Jiakai Zhang
b95f8345c8 Generate boot image profiles even if dexpreopt is disabled.
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. See boot image profiles still generated.
Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
2023-05-03 15:25:18 +01:00
Almaz Mingaleev
2429776555 Add jdk.internal.access to the allowed package list.
This is part of OpenJDK17 update.

Bug: 270674727
Test: m
Change-Id: I0708ee286cd7c3c6eef593784affaeffbdf0a76c
2023-05-03 07:21:27 +00:00
Mark Dacek
40358dce63 Merge "Process bazel metrics prior to potentially exiting upload.go" am: 2953486e31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2576890

Change-Id: Iaa1d269f947515f8f872266be8b4b35603603148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 04:25:15 +00:00
Mark Dacek
f78ffd24e7 Merge "Modify --ensure-allowlist-integrity call to avoid spurious errors." am: 833d7ee6e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2575951

Change-Id: I7d5a8f48378cd3b54ccbbde6a015bbaec9deb03d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 04:25:03 +00:00
MarkDacek
1de78f3174 Fix instantiation of config.bazelForceEnabledModules
Currently, uninstantiated, the field will be set to [""]
instead of an empty slice.

Test: m nothing --ensure-allowlist-integrity
Test: m nothing --ensure-allowlist-integrity
--bazel-force-enabled-modules=com.google.android.neuralnetworks (this
fails, as expected)

Change-Id: Ib4cd26f0cb0d40714b8c3f263ee2d22093ee15ef
2023-05-03 03:48:27 +00:00
Mark Dacek
2953486e31 Merge "Process bazel metrics prior to potentially exiting upload.go" 2023-05-03 03:37:38 +00:00
Mark Dacek
833d7ee6e3 Merge "Modify --ensure-allowlist-integrity call to avoid spurious errors." 2023-05-03 03:34:48 +00:00
Treehugger Robot
bec11740fe Merge "VSDK: use relative install path when generating snapshots" am: ad3f14edf3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2574539

Change-Id: I9774a6a3d06185c4b2563a4c4399dab5b3e9db23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:54:31 +00:00
Spandan Das
921af32310 Print default val if all vals in axis match default val
To avoid verbosity, we currently dedupe keys in axis if its value
matches the value of //conditions:default. For axes where all values
might match the default value, we would effectively drop the common
value.

To fix this, we are now dropping the select statement and not the common
value.

Test: go test ./bp2build
Change-Id: Ic377b93ee2aba971753f6a5e7a62e15d1fcfa2bc
2023-05-03 00:35:13 +00:00
Treehugger Robot
ad3f14edf3 Merge "VSDK: use relative install path when generating snapshots" 2023-05-03 00:04:08 +00:00
Cole Faust
19d6bc53ba Merge "Use api_levels_released_versions from starlark" am: 9e4c6c9cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2572830

Change-Id: If7d023b4765645832b726d19a7dd5d0664c56da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 22:27:40 +00:00
Cole Faust
9e4c6c9cc7 Merge "Use api_levels_released_versions from starlark" 2023-05-02 21:55:15 +00:00
MarkDacek
ed2253e8df Process bazel metrics prior to potentially exiting upload.go
This is a necessary step for running b on CI with metrics collection.

Bug: 280491043
Test: b build libcore:all
Change-Id: I37d621c38e3f891dd63e5977befa6ce6604487ea
2023-05-02 21:35:39 +00:00
MarkDacek
6f6b962bd0 Modify --ensure-allowlist-integrity call to avoid spurious errors.
We now ensure that the module is disabled and _not_ enabled before
failing the build.

Bug: 280439299
Test: m nothing --ensure-allowlist-integrity --bazel-mode-staging (on
master and aosp)

Change-Id: I59c969a27b064f07913a511cb29bc06d23daa371
2023-05-02 21:07:36 +00:00
Sam Delmerico
041fd49f2a Merge "add media.swcodec to Bazel staging allowlist" am: 91ac31c160
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2573432

Change-Id: I02160c03d9b5932d93e466712323a6fae4f6cd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 19:31:36 +00:00
Andrei Onea
580f7b0094 Add script for modifying privapp permission allowlists
This script will be used to change the package that is being allowed to
use privileged permissions.

Test: python scripts/modify_permissions_allowlist.py
Bug: 242509786
Change-Id: I1d7cb3c906ad39aef42ad4394953251db40d1bf1
2023-05-02 15:10:16 -04:00
Sam Delmerico
91ac31c160 Merge "add media.swcodec to Bazel staging allowlist" 2023-05-02 18:32:00 +00:00
Yu Liu
b683641de5 Merge "libbuildversion should be linked as a whole archive dep as soong does." am: bd421e06d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2560170

Change-Id: I52f117be2356da1283bf3d61f3fa716049538c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:12:29 +00:00
Yu Liu
7ded5b298f Merge "Fix a bug where CppFlags should have been Cppflags" am: 2bedceeb53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2575152

Change-Id: I2f2cc9429f87e7783e6347c68486f25e4fdc92f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:11:34 +00:00
Yu Liu
bd421e06d1 Merge "libbuildversion should be linked as a whole archive dep as soong does." 2023-05-02 17:34:02 +00:00
Yu Liu
fe978fd2c1 libbuildversion should be linked as a whole archive dep as soong does.
Bug: 278789968
Test: Unit tests and CI
Change-Id: Ic2c44826bdc03b91cc19d93f96096ec6fdf44833
2023-05-02 17:27:44 +00:00
Yu Liu
2bedceeb53 Merge "Fix a bug where CppFlags should have been Cppflags" 2023-05-02 17:23:49 +00:00
Colin Cross
bd3a16b5e7 Install sdk variants in unbundled builds and package uninstallable variants
This effectively undoes both If6c3ee82d588e2742c85cef7244c090c93f38b8e
and I682e4f1f477f3024f7719dfaa67006ef335e0640.  SDK variants are now
installed again, which will fix unbundled builds of cc_test modules.
The platform variants used by com.android.virt are now packagable
even though they are not installable.

Fix the original problem in b/194403710 by adding a flag to platform
variants of modules in apexes that are not platform available, and
using that to prevent install and packaging dependencies.  That
allows the HideFromMake flag to go back to being used for preventing
install dependencies but not packaging dependencies.

Test: TestPackagingWithSkipInstallDeps
Test: TestFileSystemShouldInstallCoreVariantIfTargetBuildAppsIsSet
Test: TestFileSystemShouldSkipApexLibraries
Bug: 194403710
Bug: 268582372
Fixes: 274443025
Change-Id: If5418df3ddbb940bd631caebdf38daa81e71f40e
2023-05-02 15:37:26 +00:00
Liz Kammer
20f0f780df Correct allowlisting for override modules
Prevoiusly, we were partially correcting for override modules in
bp2build/mixed builds in some but not all places. Now we always check
for override modules and ensure that Bazel_module properties are
propagated properly for override modules.

Bug: 279609939
Test: go test soong tests
Change-Id: I5445aa71f4c8013315415a2ca9ab9c6b3be6bce0
2023-05-02 09:27:55 -04:00
Sam Delmerico
befbf05350 add media.swcodec to Bazel staging allowlist
Bug: 279756270
Change-Id: Id8c9734185ff4fa263a2b4c28b1b7ecafa7bb0c3
2023-05-02 09:24:37 -04:00
Jeongik Cha
3a4b8a3d56 Merge "Get rid of DeviceName() from path related to dexpreopt" am: 30208863b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2546714

Change-Id: Ic9b763e98ba06a299101a0e75ca13fcc892da1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 07:55:56 +00:00
Justin Yun
17d0ee2160 VSDK: use relative install path when generating snapshots
Without respecting the relative install path, the snapshot install
path may collide when they use the same stem name.
To avoid this, respect the relative install path when generating the
snapshots.

Bug: 279652606
Test: RECOVERY_SNAPSHOT_VERSION=current m recovery-snapshot
Change-Id: Ic70a5855aeb2a6eda397b4dd06113dddb6ef70f4
2023-05-02 16:29:06 +09:00
Jeongik Cha
30208863b4 Merge "Get rid of DeviceName() from path related to dexpreopt" 2023-05-02 05:07:03 +00:00
Cole Faust
3486740cc5 Use api_levels_released_versions from starlark
Instead of exporting it to soong_injection.

Bug: 279095899
Test: m nothing
Change-Id: I7b93af233b7450848a475512b5f5682ece773c09
Merged-In: I7b93af233b7450848a475512b5f5682ece773c09
2023-05-02 01:05:07 +00:00
Spandan Das
a3122293bb Merge "Enforce stub libraries should have a single apex_available" am: e018bc858b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2533723

Change-Id: I9bb0c076ebfaf3615488fc3402a6f44b4a1dea9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:29:11 +00:00
Spandan Das
e018bc858b Merge "Enforce stub libraries should have a single apex_available" 2023-05-01 23:43:01 +00:00
Yu Liu
93893ba061 Fix a bug where CppFlags should have been Cppflags
Bug: 278789968
Test: unit test and manual build
Change-Id: I9abb056e6b820414707247d1b19ba6aabffc26ea
2023-05-01 13:55:53 -07:00
Sam Delmerico
f2ed851da2 Merge "add LLVM_*_VERSION envvars to allowlist" am: 316b0158fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2548510

Change-Id: Ib2c3679086b5d490d0897729f6bd901c45d26fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 20:51:43 +00:00