Commit Graph

68516 Commits

Author SHA1 Message Date
Andrei Onea
c53cfd54d9 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
(cherry picked from https://android-review.googlesource.com/q/commit:580636bdd23171f31bfedd773c065e0861dd5c4a)
Merged-In: Ifdcb28af40763aed7a4aac9a7f681153554bc256
Change-Id: Ifdcb28af40763aed7a4aac9a7f681153554bc256
2023-05-24 13:58:09 +00:00
Andrei Onea
d87d22372b 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
(cherry picked from https://android-review.googlesource.com/q/commit:580f7b0094bd98d3769b6cdeaaab6a9748621253)
Merged-In: I1d7cb3c906ad39aef42ad4394953251db40d1bf1
Change-Id: I1d7cb3c906ad39aef42ad4394953251db40d1bf1
2023-05-24 13:58:03 +00:00
Yu Liu
dadb5df509 Merge "Do not modify input in-place" into udc-dev am: 4f0c490ac9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374037

Change-Id: I93876a68797012cc2308e77a3649f64cd102ebc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 00:16:06 +00:00
Treehugger Robot
4db1cf525a Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into udc-dev am: 66902d7ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23275518

Change-Id: I4296718f795d02a39866c9448b18f2c7f9d6be69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 00:15:38 +00:00
Yu Liu
4f0c490ac9 Merge "Do not modify input in-place" into udc-dev 2023-05-23 23:27:34 +00:00
Treehugger Robot
66902d7ec0 Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into udc-dev 2023-05-23 23:19:22 +00:00
Yu Liu
554b3d7dbe Merge "Differentiate between empty and nil input" into udc-dev am: 267a137415
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374038

Change-Id: I5868bb527c335bfef42016753d99dfc0c92be1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 20:20:02 +00:00
Yu Liu
e8a6c62b83 Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: e80e5d8531
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374036

Change-Id: Iaf989167217e1911f5fd7ca6c13072b9208e4e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 20:19:30 +00:00
Yu Liu
267a137415 Merge "Differentiate between empty and nil input" into udc-dev 2023-05-23 19:42:30 +00:00
Yu Liu
e80e5d8531 Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev 2023-05-23 19:32:23 +00:00
Yi Kong
e695c84a4f Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23385290

Change-Id: Iafd53b25ffac19f27fd41077d265ec8545985161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 10:09:38 +00:00
Yi Kong
3de0cb7b4d Update clang version for Rust bindgen to clang-r487747c
Test: presubmit
Bug: 279955553
(cherry picked from https://android-review.googlesource.com/q/commit:6974c7ec725a948a56cd8e83bff4a2cc9cf909e3)
Merged-In: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7
Change-Id: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7
2023-05-23 07:27:03 +00:00
Spandan Das
ee84727d95 Do not modify input in-place
SortedUniqueStrings and FirstUniqueStrings dedupes repeating elements
and returns the deduped list. Currently, it also modifies the input list
in-place, which causes non-determinisitc failures like b/275313114

Operate on a copy of the input so that the input remains untouched.

SortedUniqueStrings is O(NlogN) and FirstUniqueStrings is ~O(N), so
creating a copy (O(N)) should not result in major performance regressions.
Numbers for this single unit test:
```
go test . -run TestStubsForLibraryInMultipleApexes -v -count 1000
Before: 174s
After: 172s
```

Bug: 275313114
Test: go test ./android
Test: go test . -run TestStubsForLibraryInMultipleApexes -v -count 1000
(cherry picked from https://android-review.googlesource.com/q/commit:8a8714c781175f8f1a6c189d919ee8b0ee8c1e27)
Merged-In: Id859723b2c2ebdc0023876c4b6fabe75d870bad7
Change-Id: Id859723b2c2ebdc0023876c4b6fabe75d870bad7
2023-05-22 22:42:19 +00:00
Spandan Das
de41a698f1 Differentiate between empty and nil input
Previously, CopyOf on an empty list was returning nil. With the updates
to SortedUniqueStrings and FirstUniqueStrings, we need to differentiate
between empty lists and nil.

Bug: 275313114
Test: m nothing
(cherry picked from https://android-review.googlesource.com/q/commit:cc4da765113299fa11dcb1e651ec4ae33e6f8f9b)
Merged-In: I91063ebbe5013cbda5d8f70efde4683c66581599
Change-Id: I91063ebbe5013cbda5d8f70efde4683c66581599
2023-05-22 22:41:59 +00:00
Liz Kammer
9a65ff8d1f Revert "Make min_sdk overridable in override_apex"
This reverts commit 133c55b48a.

Reason for revert: change was untested and not working

Bug: 266945903

(cherry picked from https://android-review.googlesource.com/q/commit:bd58e746928bdfd618ba81e66a19dc42f7b15380)
Merged-In: I06d6e3c439ba541ae85dc148f91b184b9731b92d
Change-Id: I06d6e3c439ba541ae85dc148f91b184b9731b92d
2023-05-22 22:39:46 +00:00
Wei Li
3194f11503 Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: dabeb50e32
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337458

Change-Id: I2cd67a8fd15ceb097f7e825c818695c85606b278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:25:00 +00:00
Wei Li
d5ec095a90 Export some make variables to Bazel through product variables. am: 5cfedc8062
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337457

Change-Id: Id7c12ae3e13f659c5b3a87440139134942dd04c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:24:55 +00:00
Wei Li
dabeb50e32 Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev
* changes:
  Change bp2build converter of module "package".
  Export some make variables to Bazel through product variables.
2023-05-19 21:37:23 +00:00
Treehugger Robot
38bd9c1a63 Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23297153

Change-Id: I1afc85f7293183bd955511f9c26788c8d2ab31c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 17:00:42 +00:00
Treehugger Robot
16ef197d6a Merge "Don't panic if no certificates found" into udc-dev 2023-05-19 16:18:34 +00:00
Wei Li
aff90c3f75 Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945be
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23305007

Change-Id: I86eebb5de030aeb56088c8fc794bb495ef3f2d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:02:14 +00:00
Wei Li
dff65b0114 Change bp2build converter of module "package".
1) Use attribute name "default_package_metadata" instead of
   "default_applicable_licenses" in packages to better describe its use.
2) Add a filegroup "default_metadata_file" in packages to search for
   METADATA file in each package.
3) Include "default_metadata_file" in each package's
   "default_package_metadata" attribute.

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:2c9e8d612819840020b2d110d23fb2771b6c92f0)
Merged-In: I645c013c39e3190fd96c4a549d39a331aced16bd
Change-Id: I645c013c39e3190fd96c4a549d39a331aced16bd
2023-05-19 00:35:57 +00:00
Wei Li
5cfedc8062 Export some make variables to Bazel through product variables.
Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:c642d688d6a091766536f0e02696d43e393f93e0)
Merged-In: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
Change-Id: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
2023-05-19 00:35:50 +00:00
Wei Li
9d307945be 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
(cherry picked from https://android-review.googlesource.com/q/commit:74e3e003148d202749cc79456e61f65ba1f4f25a)
Merged-In: I4ad68b0613410f40c79ee24d3eef779c2ad57815
Change-Id: I4ad68b0613410f40c79ee24d3eef779c2ad57815
2023-05-18 21:52:23 +00:00
Yi Kong
67735dccd6 Revert "Turn off stack protector check for noreturn calls" am: 79b9b94ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23320905

Change-Id: I450e79911619fd477e35b42ae1d19958f80dcc81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:13:05 +00:00
Yi Kong
79b9b94ea3 Revert "Turn off stack protector check for noreturn calls"
clang-r487747c contains upstream fix for the excessive stack protactor
checks (fc4494dffa54) and checks are no longer inserted for C only code
or C++ code built without exeception. The Android platform does not
enable C++ exception by default, thus turning on the check should not
have significant performance impact.

This reverts commit ecc18df6ff.

Test: presubmit
Bug: 277565884
Bug: 279955553
(cherry picked from https://android-review.googlesource.com/q/commit:e9850f81531f070ac5cd193fdcd767bc91605bfe)
Merged-In: I2fc5826048ba5d00cabcc8401ac40a6f54812a44
Change-Id: I2fc5826048ba5d00cabcc8401ac40a6f54812a44
2023-05-18 18:20:09 +00:00
Zyan Wu
d1f548a19d Don't panic if no certificates found
Getting the first certificate will panic if there are no certificates,
which can happen when AllowMissingDependencies is set and the
certificate property is a module reference to a missing module.
Only get the first certificate if the list is not nil.

Use mainCertificate since it handles the logic already.

Test: TestAppMissingCertificateAllowMissingDependencies
Bug: 283102635
Merged-In: : I8b27f65aa7d071041171ad45ac52bf47fa31bf2b
Change-Id: Icaaa45d48ca4edb876687c0813165d107d28ef8a
2023-05-18 15:58:20 +08:00
Treehugger Robot
b06258b83f Merge "Touch soong_build output at the end of main" into udc-dev am: 4020b810e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23287178

Change-Id: If54423fd2c16ae56a721807d265eddc5cb7708ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:55:24 +00:00
Treehugger Robot
4020b810e9 Merge "Touch soong_build output at the end of main" into udc-dev 2023-05-17 19:14:54 +00:00
Chris Parsons
74ac376769 Touch soong_build output at the end of main
This fixes an incrementality bug that resulted in superfluous
build.ninja regeneration after a new glob definition is added.

(cherry picked from https://android-review.git.corp.google.com/c/platform/build/soong/+/2585669)
Fixes: 279674820
Test: Treehugger
Test; New integration test in this CL

Merged-In: Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec
Change-Id: Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec
2023-05-17 18:09:56 +00:00
Justin Yun
82283a3b4f VSDK: etc snapshot may have sub_dir for relative_install_path
prebuilt_etc may use sub_dir property to define a relative install
path. Use SubDir() to read either sub_dir or relative_install_path
property.

Bug: 282080219
Test: m vendor-image
Merged-In: I07a21c5aeb87b403854ed32976d26e70b046b8c1
Change-Id: I07a21c5aeb87b403854ed32976d26e70b046b8c1
(cherry picked from commit 8bd3afe68c)
2023-05-17 10:51:28 +09:00
Treehugger Robot
356d1bb562 Merge "Update clang version to clang-r487747c" into udc-dev am: 0bd58ceeec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23173276

Change-Id: Idd7604da96bec2d788a4b5a9735621888b5e174e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 21:29:41 +00:00
Treehugger Robot
0bd58ceeec Merge "Update clang version to clang-r487747c" into udc-dev 2023-05-15 21:01:41 +00:00
Gurpreet Singh
16f72e84be Merge "Add genrule to build *.latest.version build target." into udc-mainline-prod 2023-05-15 16:31:40 +00:00
Gurpreet Singh
ed885bb7dd Add genrule to build *.latest.version build target.
Build a new target *.latest.version which will contain a text file
containing the last finalized version.

Bug: 242316893, 282140551
Test: atest prebuilt_apis_test
(cherry picked from https://android-review.googlesource.com/q/commit:daa314ac97d5ab8076113ee7f269b4e4cc3cf620)
Merged-In: I41fa91c9ec273f342b7807c66c4d65ba13260124
Change-Id: I41fa91c9ec273f342b7807c66c4d65ba13260124
2023-05-13 06:02:59 +00:00
Jiakai Zhang
04e70bc85d Dexpreopt ART jars and framework jars together. am: 5f5a17fd6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208462

Change-Id: I0fc79a2abb0f4c3aaebd60e2b262a72b51260230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:55 +00:00
Jiakai Zhang
6c7f9464d9 Unify installDirOnHost and installDirOnDevice. am: 7ba1ca0ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208461

Change-Id: I1e4df4385046b3f5d4ccf6feacc3500414268c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:53 +00:00
Jiakai Zhang
4d8badb6fe Remove the ability to install boot images by bootclasspath_fragments. am: 4e9eb1ae46
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208460

Change-Id: I3acf79fa37df6c6b97de0b79d44a948e1d1a5b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:51 +00:00
Jiakai Zhang
087f594948 Prepare tests for dexpreopt changes. am: c67528bf7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714

Change-Id: I468d89ed0ec9eec3a24a9d0e4e85f597370057ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:48 +00:00
Jeongik Cha
120ff02b72 Get rid of DeviceName() from path related to dexpreopt am: bc9256b531
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23208459

Change-Id: Id0dca9aa443c8ca8155e24ba61dd6e8c0b914799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:45 +00:00
Jiakai Zhang
5f5a17fd6b Dexpreopt ART jars and framework jars together.
Bug: 280776428
Test: atest art_standalone_dexpreopt_tests
Test: -
  1. m
  2. Check .invocation file (http://gpaste/6498044089466880)
  3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64
Test: -
  1. m dist
  2. Check files in out/dist/boot.zip
Test: -
  1. art/tools/buildbot-build.sh --host
  2. m test-art-host-gtest
  3. art/test/testrunner/testrunner.py --host
Test: m build-art-target-golem
(cherry picked from https://android-review.googlesource.com/q/commit:c08c162b5a82ddfc44e9944d798636b2241308de)
Merged-In: I89490252e56a05edab03fdddc6539fa4d7f79756
Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
2023-05-12 11:16:31 +00:00
Jiakai Zhang
7ba1ca0ac3 Unify installDirOnHost and installDirOnDevice.
These two fields never do what they are described to do. This CL unifies
them to avoid the confusion.

Bug: 280440941
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:09d88df0407263e846b01c226184b262f2e36678)
Merged-In: I3652d73a50832a2e494d9f5cae750f5fc38293b4
Change-Id: I3652d73a50832a2e494d9f5cae750f5fc38293b4
2023-05-12 11:16:22 +00:00
Jiakai Zhang
4e9eb1ae46 Remove the ability to install boot images by bootclasspath_fragments.
We don't need this anymore because we are going to compile ART jars and
framework jars together.

Bug: 280776428
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:b47caccbc037b65462f757c462a99732ad6dd51c)
Merged-In: I070157530449a1bb5779e25984c367df3dde7b36
Change-Id: I070157530449a1bb5779e25984c367df3dde7b36
2023-05-12 11:16:10 +00:00
Jiakai Zhang
c67528bf7e Prepare tests for dexpreopt changes.
After this change, there is a clear separation between tests that are
related to dexpreopt and tests that are not. The former uses
PrepareForTestWithDexpreopt, while the latter uses
PrepareForTestWithJavaDefaultModules. The benefit is that the latter
will no longer affected by any dexpreopt changes.

Bug: 280776428
Test: m nothing
(cherry picked from https://android-review.googlesource.com/q/commit:b95998be731406209f18fab764b96421a17ab4c9)
Merged-In: Ib957765b9287d51c082e0a33cee17a6bb56daeef
Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef
2023-05-12 11:16:01 +00:00
Jeongik Cha
bc9256b531 Get rid of DeviceName() from path related to dexpreopt
As-is, dexpreopt config and bootjar is in the dir including
DeviceName(). It causes unnecessary dexpreopt invocation when target is
changed repeatly. To avoid it, rename dir to common name.

Bug: 278833696
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:4753b39ccaaf573910e6b7a4200e9ca03ec8d96d)
Merged-In: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
2023-05-12 11:15:51 +00:00
Yi Kong
e3a5103cba Update clang version to clang-r487747c
Test: presubmit
Bug: 279955553
Change-Id: Ibe3b5e81f7850560b340c89a1f83d5ebdf4fc25f
Merged-In: Ibe3b5e81f7850560b340c89a1f83d5ebdf4fc25f
(cherry picked from commit 1c22301735)
2023-05-11 16:52:11 +01:00
Jiakai Zhang
1d2252d686 Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043873

Change-Id: I57147254371a1695aff9973e0846807e53180550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:20:22 +00:00
Jiakai Zhang
9875d6311c Generate boot image profiles even if dexpreopt is disabled. am: 1d99986d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23043872

Change-Id: I9e61b59fb1ccfbaae0ab4950b724a1551e5fede8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:20:20 +00:00
Jiakai Zhang
51babf3c4c Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev
* changes:
  Generate app profiles even if dexpreopt is disabled.
  Generate boot image profiles even if dexpreopt is disabled.
2023-05-10 13:38:14 +00:00
Treehugger Robot
93d4662a48 Merge "VSDK: use relative install path when generating snapshots" into udc-dev am: 1dd392b123
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22980276

Change-Id: Ia3da01309bb64d34f8c039b90d1a8ae39d8af889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 06:33:07 +00:00