Commit graph

84045 commits

Author SHA1 Message Date
Vinh Tran
daae55687b Optionally include afdo_profiles.mk if available am: 9281bc8c8f
Original change: https://android-review.googlesource.com/c/platform/build/+/2552262

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

Change-Id: Id1dbcb10e191d7a61f8fa70eae8f545ad7da23e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:27:18 +00:00
Treehugger Robot
e16241ce4f Merge "Remove lunch target from appcompat log" 2023-04-21 05:46:47 +00:00
Treehugger Robot
6a2b03bae8 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: I0f0fc464ca4b7243b53a36ea433bf17269888a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 02:16:24 +00:00
Treehugger Robot
269248add6 Merge "Cleanup the list of Soong prebuilt module types." 2023-04-21 01:40:01 +00:00
Vinh Tran
9281bc8c8f Optionally include afdo_profiles.mk if available
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
Merged-In: I2cc51412de141c4e6ad69f49cef378121e0b3b87
2023-04-20 17:33:00 -04:00
Wei Li
6f407ba0a8 Cleanup the list of Soong prebuilt module types.
Bug: 272356622
Test: CIs
Change-Id: I4031f0a73f5af1bbf1eb374bcd7d3a19b9609a46
2023-04-20 14:13:58 -07:00
Treehugger Robot
3de45a7b2b Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: I6e20f9cd33d7b3e6ca6aa9a29a9f13c50b679fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 15:51:12 +00:00
Treehugger Robot
ece71703f8 Merge "Allow ota_from_target_file to work entirely on directories" 2023-04-20 15:17:50 +00:00
Bob Badour
f59aae96fa Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: I6fe3e38d5ce39eb39df95ea993fe7eda47e81c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 14:29:50 +00:00
Bob Badour
9e9336f285 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2023-04-20 13:35:27 +00:00
Treehugger Robot
fa7573bf19 Merge "Add create_brick_ota to otatools.zip" am: 05cffb1b2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2547515

Change-Id: I9c6c4ba7046c749b76edfc737be6f4ac423ff601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 10:29:56 +00:00
Treehugger Robot
05cffb1b2a Merge "Add create_brick_ota to otatools.zip" 2023-04-20 09:49:59 +00:00
Roman Kiryanov
40e233c6ba Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I57cd7c4dd7c82ffc05a2115b37a6653ccd261ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 06:40:21 +00:00
Roman Kiryanov
aa1f970711 Merge "Cleanup in emulator_arm64/device.mk" 2023-04-20 05:59:27 +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
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-19 13:30:46 -07:00
Wei Li
54854098e9 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I80b17ef163898aa1f5d667fa35539ce99026169a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 17:32:50 +00:00
Bob Badour
ffba21bbae [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  tools/sbom/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I1f8e5fd8e787a4c53bf4caf80a4000d46d0291e4
2023-04-19 09:48:01 -07:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Colin Cross
b8dad832a7 Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: Iea367fd221a07576cdbbfea86479961bb22fb11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19 03:38:46 +00:00
Colin Cross
4cd2568acc Merge "Move old installed file cleanup logic below build/make/core/Makefile" 2023-04-19 02:42:03 +00:00
Kelvin Zhang
9dbe2ce40f Allow ota_from_target_file to work entirely on directories
When building android, build system will first zip target_file directory
into a .zip file, and then invoke ota_from_target_files. We
ota_from_target_files can work directly on top of directories, we can
parallelize OTA generation and target_file zipping, making builds
faster.

Bug: 227848550
Bug: 277028723
Test: th
Change-Id: Id72bd7cca708af0e1bae2db754f39b27777cd601
2023-04-18 17:47:29 -07: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
Treehugger Robot
8670880361 Merge "Fix duplicate super_empty.img" am: 67ca3c05c7
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I15da5d8b64dd98afc62040aad78ea2169f75b067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:36:11 +00:00
Treehugger Robot
56c66e00bf Merge "Try with search_path for some avb path args" am: b7a45ea13d
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I4061c3cb39ab7cd4800cc6e4bb08aadbf47b46c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:35:02 +00:00
Treehugger Robot
67ca3c05c7 Merge "Fix duplicate super_empty.img" 2023-04-17 21:19:13 +00:00
Treehugger Robot
b7a45ea13d Merge "Try with search_path for some avb path args" 2023-04-17 20:43:12 +00:00
Kelvin Zhang
aecdc18222 Fix duplicate super_empty.img
When calling add_img_to_target_files twice, super_empty.img will be
written twice, and resulting zip would contain duplicate entries.

Test: th
Bug: 278522974
Change-Id: I2419d0c4f8b04f876a8cc69a1517f59cab94d75d
2023-04-17 09:52:39 -07:00
Alex Buynytskyy
510ada3933 Merge "Finalization script fixes." am: 2ba40b5be6
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I58becfef52885d057df9a748518ea7a1ba85c2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 15:57:00 +00:00
Alex Buynytskyy
2ba40b5be6 Merge "Finalization script fixes." 2023-04-17 15:26:16 +00:00
Alex Buynytskyy
f7a5e2fa4b Finalization script fixes.
- actually do the first step instead of just logging a message,
- make sure extension SDK bump gets picked up by the topic,
- fix the resources_sdk_int in first step, and unfix in the second.

Bug: 278246368
Fixes: 278246368
Test: local run
Change-Id: I0d0f4e2ec7f0b584b9fc14a545cfec73a9fcbdea
2023-04-16 21:15:18 -07:00
Treehugger Robot
42cfbe4f1a Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: I9aa503574c3ca689161fdcfe1618ec79821a973a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 21:11:36 +00:00
Treehugger Robot
3fb8d2bad8 Merge "Fix the following issues mentioned in Pixel SBOM review." 2023-04-15 20:34:52 +00:00
Wei Li
5290825452 Fix the following issues mentioned in Pixel SBOM review.
1) PackageSupplier should be NOASSERTION if there is no homepage
   information in METADATA file of source packages
2) PackageDownloadLocation of upstream packages should be NOASSERTION if
   there is no code repository URL in METADATA file of source packages

Test: CIs
Test: atest --host sbom_writers_test
Change-Id: I8a0298b7bacc2f96555f9d7dde0d21ada8c6b564
2023-04-15 06:05:32 +00:00
David Anderson
70e4fa03b7 Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I5c67e68393a2b9b7080c27f9299193486d78a3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 05:31:03 +00:00
David Anderson
23c2df71bc Merge "ota_from_target_files: Disable XOR on <T vendor." 2023-04-15 04:52:46 +00:00
Treehugger Robot
78667a4692 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

Change-Id: I315fd1f9274cfda7b45c84b229ca6d6f040aa3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 02:26:07 +00:00
Dennis Song
e890d0008c Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541

Change-Id: I2a38a896019d5f295dc0230f4496d91c31118f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 01:56:21 +00:00
Treehugger Robot
7b640806da Merge "Revert "Remove all ZIP64LIMIT hack"" 2023-04-15 01:48:58 +00:00
Dennis Song
5da012adb0 Merge "Include META/* in the vendor item list when rebuild-sepolicy" 2023-04-15 01:15:44 +00:00
Florian Mayer
b98ff26c7d Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd72c47073253b10e45bcddfaaf8e24617dc02b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:38:37 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
David Anderson
1c59617820 ota_from_target_files: Disable XOR on <T vendor.
Bug: N/A
Test: ota_from_target_files
Change-Id: Ia9093a3c3f79d88f98f0777e8a0f8c72741055b8
2023-04-14 16:01:55 -07:00
Kelvin Zhang
f92f7f046a Revert "Remove all ZIP64LIMIT hack"
This reverts commit 37a4290909.

Reason for revert: b/278156419

Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
2023-04-14 21:32:54 +00:00
Treehugger Robot
28fc5a97a7 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." am: ebf41e9a91
Original change: https://android-review.googlesource.com/c/platform/build/+/2525827

Change-Id: I547848b6a2eb24acf6f375e759015c2a5188c8bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 20:55:18 +00:00
Treehugger Robot
f4c40a7eb2 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I1cb8e4aca08ea4298c5e832087c088ed958795a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 20:55:03 +00:00
Treehugger Robot
ebf41e9a91 Merge "Create separate python libraries for the following logic and refactor SBOM generation script accordingly." 2023-04-14 20:43:58 +00:00