Commit graph

33802 commits

Author SHA1 Message Date
Steve Berbary
e4783d4b7a Update Security String to 2023-07-05 am: d6c119bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I32253c6815cc77d3c1a5dea63bde576a8deb900c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:21:05 +00:00
Steve Berbary
d6c119bfaa Update Security String to 2023-07-05
Bug: 282371465
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:22:23 +00:00
Jiakai Zhang
81cd7533c9 Also disable dexpreopt for boot images for unbundled builds.
This fixes the tradefed build error caused by aosp/2582191.

Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
(cherry picked from https://android-review.googlesource.com/q/commit:c74a4011e2815f2ffc3815176c958a0fdabbd621)
Merged-In: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 18:31:22 +00:00
Julien Desprez
372c3d6be5 Merge "Revert "Add Traefed Contrib to CATBox"" into udc-dev 2023-05-03 21:16:37 +00:00
Hang Lu
b2d34e4d4a Enable HWASan for multiple modules in one place(Make)
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: I4493cb627fb564ee317eb95bd24ec020d42ae28c
Change-Id: I4493cb627fb564ee317eb95bd24ec020d42ae28c
(cherry picked from commit e235ded733)
2023-05-02 22:44:07 +00:00
Julien Desprez
56d335bdb5 Revert "Add Traefed Contrib to CATBox"
This reverts commit a527b1a0ee.

Reason for revert: tradefed-contrib isn't an allowed dependency outside tradefed. Suites shouldn't use it. This breaks prebuilts in udc-*
Bug: 280372052
Change-Id: Id840568f36a801e19e7bb8e9c34cef2aeb625f1d
Ignore-AOSP-First: revert of CL submitted in internal anyway
2023-05-02 22:08:21 +00:00
LaMont Jones
c28fb44256 Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" into udc-dev 2023-05-02 21:51:16 +00:00
Kalesh Singh
d043f3bc68 Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" into udc-dev 2023-05-02 16:12:53 +00:00
Joe Onorato
9f5b5c2268 Save approx 18GB of RAM by not having a bazillion copies of the same modules names
Bug: 280108166
Bug: 278864904
Test: treehugger, m, manual inspection
Merged-In: 2556850
Change-Id: Ib564b3edf4a0523fc8231b8e57a5ba9c42a73294
2023-05-01 21:20:28 +00:00
Kalesh Singh
c480b5d4c4 16k: Add ro.product.cpu.pagesize.max property
The device's max supported page size is determined by the
build variable TARGET_MAX_PAGE_SIZE_SUPPORTED.

Export this variable as system property for use in tests.

Bug: 277360995
Test: atest -c vendor_elf_alignment_test -s <serial>
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:72222fbec9b2efd6709e263dc16bcca98f216c15)
Merged-In: I4f33a42de359c8119e55056f9fd9c7147c7058ec
Change-Id: I4f33a42de359c8119e55056f9fd9c7147c7058ec
2023-04-28 20:37:47 +00:00
Juan Yescas
39e34a9def 16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag
The PRODUCT_MAX_PAGE_SIZE_SUPPORTED will be used to define the
ELF segment alignment of the binaries (executables and shared
libraries). The alignment is set based on these conditions:

- If PRODUCT_MAX_PAGE_SIZE_SUPPORTED is defined, that value will be
used to align the binaries. If not defined, see condition below:
- If it is a low memory device, 4096 will be the alignment. If it is
not low memory device, see conditon below:
- If VSR vendor API level < 34, 4096 will be the alignment, otherwise
it will be 65536.

Test: Built for in Pixel 4a, 6 and verified the alignment with readelf.
Bug: 276963698
Bug: 276801883
(cherry picked from https://android-review.googlesource.com/q/commit:e5c0c174d50e4fab5db797dc815a875d673eadac)
Merged-In: I53a8902ab62e6d378aec84c28bc627f0e8a98500
Change-Id: I53a8902ab62e6d378aec84c28bc627f0e8a98500
2023-04-28 18:28:30 +00:00
Peiyong Lin
6871bbf91e Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
Merged-In: I4d7ffb869ced219009446d907230178e4b940157
2023-04-27 22:36:36 +00:00
Yuxin Hu
7ea4231664 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" into udc-dev 2023-04-27 15:36:27 +00:00
Yuxin Hu
9dfc376c19 Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor
This is a change cherry-picked from aosp:
https://r.android.com/2560175

Merged-In: I0fb881962ab77abd18f05d33393c4ee11694109c

Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases

Change-Id: I4632ff64bc26623c796b992a71761a754149955a
2023-04-26 21:02:13 +00:00
Alex Buynytskyy
20466aa978 [RESTRICT AUTOMERGE] UpsideDownCake/34 is now REL
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I4b5e9939b60cde7482021fc1d0aede38a99493c1
Merged-In: I4b5e9939b60cde7482021fc1d0aede38a99493c1
2023-04-21 19:37:09 +00:00
Treehugger Robot
056ae79b51 Merge "Remove lunch target from appcompat log" am: e16241ce4f am: 80386ca945 am: 9b766fa41c
Original change: https://android-review.googlesource.com/c/platform/build/+/2542810

Change-Id: If4399fb590a4035627690c2302cf167013ef76fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:48:29 +00:00
Treehugger Robot
9b766fa41c Merge "Remove lunch target from appcompat log" am: e16241ce4f am: 80386ca945
Original change: https://android-review.googlesource.com/c/platform/build/+/2542810

Change-Id: I8904a5088b72686ac52ae37fe735f283cf755c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:06:13 +00:00
Treehugger Robot
e16241ce4f Merge "Remove lunch target from appcompat log" 2023-04-21 05:46:47 +00:00
Vinh Tran
40db731ad4 Merge "Split PRODUCT_AFDO_PROFILES into two variables" into tm-qpr-dev-plus-aosp am: 42b7e605c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22603331

Change-Id: I02df3c23795d8a543a1cdff117cd29a40dd21e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 19:54:03 +00:00
Vinh Tran
42b7e605c2 Merge "Split PRODUCT_AFDO_PROFILES into two variables" into tm-qpr-dev-plus-aosp 2023-04-20 19:20:19 +00:00
Treehugger Robot
5c2fd939b9 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a am: fa7573bf19 am: 9563d43a64
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I7c0d25bd561e7103c2fd123e5467079cadfdd10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 11:51:26 +00:00
Treehugger Robot
9563d43a64 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a am: fa7573bf19
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I73d22b92ad840f432c099773992c760c963f4a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 11:09:13 +00:00
Kelvin Zhang
ca812338a2 Add create_brick_ota to otatools.zip
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.

Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
2023-04-19 19:15:07 -07:00
Wei Li
4f8f32b14f Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 am: b3565b4aa4
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I234246245c1c9d63a9c7758d9fab8196e8b8475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 19:34:48 +00:00
Wei Li
b3565b4aa4 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 18:21:26 +00:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Vinh Tran
ebce49601a Split PRODUCT_AFDO_PROFILES into two variables
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.

Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list

Ignore-AOSP-First: ag/22604900 in the same topic is in internal repo
Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
2023-04-19 15:54:13 +00:00
Colin Cross
64fae70977 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7 am: d844885259
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I70c0736a9c50524e21c6e20c44e473210e2b0451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 05:12:30 +00:00
Colin Cross
d844885259 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 04:23:50 +00:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory.
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
2023-04-18 15:57:34 -07:00
Colin Cross
bc18b00770 Move old installed file cleanup logic below build/make/core/Makefile
build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.

Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
2023-04-18 11:32:24 -07:00
Inseob Kim
168ab6af74 Remove lunch target from appcompat log
This is to reduce build rule divergence among targets. We only need the
path under PRODUCT_OUT.

Bug: 277662244
Test: build and boot
Change-Id: Ica8776d1779c47305c3c74015be2b3597cbdf95c
2023-04-18 14:02:52 +09:00
Florian Mayer
074dce314c Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d am: aca0515f1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
73f61e7ede Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e am: c129df521c
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: I6bce6615763f6e2d5d1fb1faba0f2879a0704b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 20:09:07 +00:00
Treehugger Robot
c129df521c Merge "Make sort as part of the inner command" am: 859d43a1bd am: 29a137ab3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2517275

Change-Id: Ie5cc79ab5616cb59828b7506f53ca28f0f7e763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 19:04:08 +00:00
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +00:00
Wei Li
b05968e183 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b am: f27ff5e616
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I23fa0c10ae08c9b80e93aa051e8f960ffb24fe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 17:30:04 +00:00
Wei Li
f27ff5e616 Merge "Copy SBOM files to directory dist/sbom instead of dist/." am: 4dfc33e4dd am: 96fead867b
Original change: https://android-review.googlesource.com/c/platform/build/+/2534191

Change-Id: I04420fa2bb20743249e515a47a51e2d0dcc87c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 16:43:58 +00:00
Wei Li
c4d0a61ee3 Copy SBOM files to directory dist/sbom instead of dist/.
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.

Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
2023-04-13 02:12:32 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Wei Li
cbeaa85076 Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b am: 82bf15a96d
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I3bbd10804b31aeccf1d1d386bb9c829d0b8cc27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:33:47 +00:00
Wei Li
82bf15a96d Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:00:47 +00:00
Wei Li
ff8e18cf3e Revert "Revert "Copy SBOM to dist directory when running "m dist".""
This reverts commit fd358ae340.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
2023-04-11 23:43:54 +00:00
Treehugger Robot
f85af51468 Merge changes from topic "presubmit-am-e7bd37b8d4a54cc5a85736dbe59d11b1" into tm-qpr-dev-plus-aosp am: cbcde78d22
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Change-Id: If47f10b8d733055b04e0c9a81f525011de706765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 20:59:31 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
2023-04-11 01:54:58 +00:00