Commit Graph

5965 Commits

Author SHA1 Message Date
Yu Liu
4f0c490ac9 Merge "Do not modify input in-place" into udc-dev 2023-05-23 23:27:34 +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
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
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
Jiakai Zhang
1b2f306db8 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.
(cherry picked from https://android-review.googlesource.com/q/commit:cf61e3c59133227894ac7d72091b48451a3e6761)
Merged-In: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2

Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
2023-05-09 21:47:33 +01:00
Treehugger Robot
70811b4030 Merge "Enable HWASan for multiple modules in one place(Soong)" into udc-dev 2023-05-03 18:44:39 +00:00
Alexei Nicoara
eb6c2a2fba Merge "Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"" into udc-dev 2023-05-03 16:51:16 +00:00
Alexei Nicoara
1240f28d09 Revert "DO NOT MERGE: Changing the udc-dev version to 345990000"
This reverts commit ec0e5a3e97.

Reason for revert: b/280553936

Change-Id: Iad9079f026f46da35f36723937db9bf5771580d1
2023-05-03 16:43:37 +00:00
Hang Lu
88086621d1 Enable HWASan for multiple modules in one place(Soong)
Environment variables HWASAN_INCLUDE_PATHS and
PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple
modules, by just adding the module directory to the env variable.

Bug: b/271948407
Test: Set specific module directory to above env variable and check the
assembly codes of output elf files after building, finding hwasan
related symbols inside.

Merged-In: Ic49b515830c4469ca5fa94f547b26c0fb602fc54
Change-Id: Ic49b515830c4469ca5fa94f547b26c0fb602fc54
(cherry picked from commit a98aab98c4)
2023-05-02 22:44:03 +00:00
Juan Yescas
e6979a102c 16k: Align shared libraries and executables to 4k by default
The default ELF segment alignment will be 4096. This alignment
can be overriden by setting the desired alignment in
PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag. The alignment has to be
a multiple of the configured kernel page size.

Test: Built changes for Pixel 4a, 6 and checked alignment.
Bug: 276963698
Bug: 276801883
(cherry picked from https://android-review.googlesource.com/q/commit:05d4d901146d96634ad0ff3a9982c9c87c394f18)
Merged-In: Icb380041a5b27da1fa0d86b302e1e7cde9a236d7
Change-Id: Icb380041a5b27da1fa0d86b302e1e7cde9a236d7
2023-04-28 18:29:50 +00:00
Alexei Nicoara
ec0e5a3e97 DO NOT MERGE: Changing the udc-dev version to 345990000
The udc-dev version is now lower than the prebuilts b/278817494.
Increasing it so it's higher than prebuilts but still low enough, b/231691162 suggested initially to use xx5990000 for x-dev.

I've checked tm-dev and the latest prebuilt was 3318, so 3459 prefix should be enough for udc-dev.

Change-Id: Idc85a121825aea754b258b306660ca71c6b1fdd9
BUG: 278817494
Ignore-AOSP-First: This change is needed in udc-dev only
2023-04-27 11:33:32 +00:00
Spandan Das
e4001552d9 Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5 am: 56797fd547 am: 88b15818b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535121

Change-Id: I3f43bc39e8cc0ea9d37f6ae64ca7993446b084da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 17:23:47 +00:00
Spandan Das
0bf4ea53f5 Merge changes I4129c2a9,I9af06f81
* changes:
  Drop the default apex_available value from BUILD files
  Make //apex_available:platform the default.
2023-04-20 15:30:20 +00:00
Zi Wang
def5977a8a Merge "Fix api fingerprinting with apex." am: 04af019ec0 am: ccd6dc4983 am: 59e10ef97d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541451

Change-Id: Ic9a255c57fed3d0d48ea3dcdb895b12c155db73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 19:04:55 +00:00
Zi Wang
a4f7dae7b9 Fix api fingerprinting with apex.
Test: b build adbd and tzdata and verify target sdk version is correct

Bug: 277921995
Change-Id: I05a98fcb628f2a1d83358fe79f19c58010f05430
2023-04-18 21:12:02 +00:00
Usta (Tsering) Shrestha
f8b266a164 Merge "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" am: cf76125627 am: 708673e0bc am: 2be450f6b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539110

Change-Id: I06028a22d84d4bec435de13cb30190bdac5d8c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 15:27:20 +00:00
Usta (Tsering) Shrestha
cf76125627 Merge "Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp" 2023-04-18 14:18:51 +00:00
Romain Jobredeaux
cbba377c78 Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff am: 4ff491c45c am: 38d950e1b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: Icd567ea7ef711d62ca447e59d99e481866e22d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:39:31 +00:00
Spandan Das
2dc6dfcb16 Drop the default apex_available value from BUILD files
If apex_available is missing from Android.bp files, ApexAvailable
returns [//apex_available:platform], which is the default. To avoid
BUILD file verbosity, remove the build system default value from the
generated BUILD files.

Bug: 277651159
Test: go test ./bp2build

Change-Id: I4129c2a93ac28578f46ebeed49baa23ce727aa1f
2023-04-17 19:26:03 +00:00
Spandan Das
8e6386e0aa Make //apex_available:platform the default.
go/Android.bp mentions that ["//apex_available:platform"] is the
default, but currently it was []. This change does not create any
additional module variants.

(Noticed this for libz, I was expecting its apex_available to be
platform and not an empty list)

Test: TH
Change-Id: I9af06f813b1a1d7b716939874f469bd2e1ce4d14
2023-04-17 17:28:06 +00:00
Romain Jobredeaux
aa6e25df46 Allowlist CaptivePortalLogin and required dependencies.
Change-Id: I5ed5bfa70d5a7d179e8721df0e833315a2ada05a
Bug: 215230089
2023-04-17 09:50:04 -04:00
Vinh Tran
2562585878 Add aidl.deps prop to include aidl implicit deps explicitly in Android.bp
In a follow-up CL, we should eventually disallow aidl.include_dirs in cc rules so that the deps are always explicit and compatible with Bazel migration.

Test: go test
Bug: 278059962
Change-Id: Ia786cc8634d03589dc008f10b01e6bb2b9f2c7f0
2023-04-14 19:28:44 -04:00
Cole Faust
55f7fafb62 Merge "bp2build support for python_test(_host)" am: ae31382119 am: 2958c917d1 am: 7bf85f7d57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: I71478bdff4e0321cc0302e3654bd81b959e1be48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 22:26:51 +00:00
Cole Faust
ae31382119 Merge "bp2build support for python_test(_host)" 2023-04-14 20:49:01 +00:00
Mark Dacek
052ed1234a Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c am: a2c259c1a7 am: 1554515dac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I19d2419321ac6ec6c3ada40186f3d1ef8dba6e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:51:19 +00:00
MarkDacek
9c094ca153 Fix issue where bazel-force-enabled-modules aren't actually analyzed.
Bug: 273910287
Test: run mixed_mode_test.sh

Change-Id: I309c423b6e7f505ad1db0d9327e7de6b8298dfe9
2023-04-14 02:17:54 +00:00
Cole Faust
d82f036b89 bp2build support for python_test(_host)
There was a request for using b with python tests. bp2build python
tests exactly the same way as python binaries so that they can be
used with `b`.

Bug: None
Test: go test
Change-Id: Id68a6a73572745a4885b3e5bb1b8452e36baa982
2023-04-13 16:10:59 -07:00
Treehugger Robot
ba67d45939 Merge "Add external_updater to bazel allowlist." am: 01add2893c am: 73b1bed6db am: aa6090332f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536370

Change-Id: Idb31146e19c7a1f653a076cf1fdd677ec8b38cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 22:36:04 +00:00
Romain Jobredeaux
f958f61007 Merge "Bp2build support for sdk_version and java_version." am: a3c029e7d5 am: f8ebe7f3e8 am: e9ab0a3cef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454209

Change-Id: I37aac3f2bc75d86d40dc673cb0a43c475abd41cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 22:32:40 +00:00
Treehugger Robot
01add2893c Merge "Add external_updater to bazel allowlist." 2023-04-13 21:13:05 +00:00
Romain Jobredeaux
a3c029e7d5 Merge "Bp2build support for sdk_version and java_version." 2023-04-13 20:53:07 +00:00
Dan Albert
f1235a8787 Add external_updater to bazel allowlist.
Bug: None
Test: treehugger
Change-Id: I2b8a357198dbe0b2be4850ba7de4a749910c1be1
2023-04-13 16:39:28 +00:00
Treehugger Robot
a076929b0a Merge "Fix crash when missing platform sdk version" am: 5a15e9522c am: deb7891970 am: c7fdf76927
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2533719

Change-Id: I6d8abb2e2b4617260ca1bfe6691798d74f20d5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 22:00:11 +00:00
Treehugger Robot
72f65f9e6e Merge "Make buildroot.cquery determinisitc" am: 7a9626c655 am: 29fb9ead5c am: 177d8ca6b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488996

Change-Id: I99697638b2c1eda9ceb6e8de103d9d4c5332206d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:59:51 +00:00
Treehugger Robot
5a15e9522c Merge "Fix crash when missing platform sdk version" 2023-04-12 21:35:31 +00:00
Treehugger Robot
7a9626c655 Merge "Make buildroot.cquery determinisitc" 2023-04-12 21:04:52 +00:00
Treehugger Robot
95529b2aba Merge "add libneuralnetworks[_static] to staging allowlist" am: ebf93ff2d8 am: d46438324e am: 9ac5722c8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2527041

Change-Id: I51100ec804a5983f5b25276248553595a5816785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:16:12 +00:00
Cole Faust
37d27c4884 Fix crash when missing platform sdk version
Fixes: 277890306
Test: Presubmits
Change-Id: I26658a90856cb057c631bb71ca0cd094ed648cf5
2023-04-12 10:32:18 -07:00
Treehugger Robot
ebf93ff2d8 Merge "add libneuralnetworks[_static] to staging allowlist" 2023-04-12 17:08:01 +00:00
Jingwen Chen
5939449257 Merge "Revert^2 "Re-land test tzdata apex with bazel builds."" am: aea34a38ca am: c8442df5db am: 28bef1dd94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2529691

Change-Id: I2c0d07bc6393956e096cec157370acb6321e69fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 08:33:13 +00:00
Jingwen Chen
aea34a38ca Merge "Revert^2 "Re-land test tzdata apex with bazel builds."" 2023-04-12 06:50:26 +00:00
Cole Faust
d956aa4c1c Merge "Break constant information out of product vars" am: 12f9cef5fe am: 70c385ac49 am: 87a98a64cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2532142

Change-Id: Ic6fcadd0ab5d913c1b7df44b248872502db0b769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 06:00:32 +00:00
Cole Faust
12f9cef5fe Merge "Break constant information out of product vars" 2023-04-12 04:08:45 +00:00
Steven Moreland
f4353c5355 Merge "Add name hint to Soong." am: a80b113f55 am: 4365189ed3 am: 9da29c4ad9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518037

Change-Id: Iff87fa4a1e228cbb0cbbf0e343a39abba0dfdcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 03:18:16 +00:00
Jihoon Kang
76c22a0b1c Merge "Remove completed TODO in android/visibility.go" am: bbd707fadf am: 2fade6e31b am: 28b5b0c3c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2529299

Change-Id: Ib88ea658734734de5751f6750c8e1004e6123b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 03:17:55 +00:00
Romain Jobredeaux
2eef2e13e9 Bp2build support for sdk_version and java_version.
This CL adds java_version and sdk_version support to bp2build
converters for
   - java library
   - java binary
   - android library
   - android binary
   - android library import

Although java import doesn't support java_version and sdk_version, the
neverlink java_library wrapper around a java_import must specify a
sdk_version when targetting a device. "none" is used by convention.

Change-Id: I22a69dea2e351858368df69ed6a703b568d613ea
Bug: 215230098
Test: Presubmits
2023-04-11 21:05:48 -04:00
Cole Faust
eb644cfb34 Break constant information out of product vars
We don't want rules to load the product variables directly, because
then they won't be able to transition on them.

Break constant information that is safe to load outside of the
product vars file, so that we can make the product vars file have
more restricted visibility later.

Bug: 269577299
Test: m nothing
Change-Id: I848bff33e4f5798f51296ea3a2600615cab36985
2023-04-11 15:38:43 -07:00