Commit graph

84662 commits

Author SHA1 Message Date
Treehugger Robot
315e8b52ef Merge "Don't skip vndk finalization." 2023-04-21 23:21:13 +00:00
Kalesh Singh
72222fbec9 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>
Change-Id: I4f33a42de359c8119e55056f9fd9c7147c7058ec
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-04-21 21:04:10 +00:00
Alex Buynytskyy
f5897ecdb6 Don't skip vndk finalization.
Bug: 275409981
Test: local run
Change-Id: I6651f29e3c5fd5f1ccb6ec07fd52491ba16f5086
2023-04-21 19:08:50 +00:00
Xin Li
bd259b2f43 Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:21 +00:00
Kelvin Zhang
ca45d7a85d Fix incremental OTA generation failures
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723

Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
2023-04-21 17:30:50 +00:00
Treehugger Robot
db5ae5b97a Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" am: fad3925959
Original change: https://android-review.googlesource.com/c/platform/build/+/2540830

Change-Id: Ibf012873a31fcebc41284fe7ce62beef56d5e0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:18:46 +00:00
Treehugger Robot
fad3925959 Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" 2023-04-21 16:50:00 +00:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
2023-04-21 09:49:08 -07:00
Vinh Tran
a37289873a Merge changes from topic "AFDO_PROFILES" am: e222b9d6e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2539170

Change-Id: I337a53d645ec18dac5dd0234830af1e89cd55756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 15:54:34 +00:00
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
Vinh Tran
e222b9d6e4 Merge changes from topic "AFDO_PROFILES"
* changes:
  Split PRODUCT_AFDO_PROFILES into two variables
  Optionally include afdo_profiles.mk if available
2023-04-21 15:06:28 +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
Kelvin Zhang
2c561d8cb1 Create new target-files-dir target
Create a new phony target target-files-dir, which points to
$(BUILT_TARGET_FILES_DIR) . All dependencies of
BUILT_TARGET_FILES_PACKAGE are now a dependency of
BUILT_TARGET_FILES_DIR. The purpose of BUILT_TARGET_FILES_DIR is to
represent an unzipped version of the target_files.zip . Some tools, such
as ota_from_target_files, can work directly with unzipped target_files.
This change allows such tools to avoid having to zip the target_files
by depending on BUILT_TARGET_FILES_DIR instead of
BUILT_TARGET_FILES_PACKAGE.

This CL does not have any functional changes, targets such as otapackage
and updatepackage still depend on the zipped target_files.

Bug: 227848550
Bug: 277028723

Test: m installclean && m updatepackage
Change-Id: I83e69370ae5efa9046710f5909276077796f6b30
2023-04-20 21:08:06 -07: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
424539f6c1 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

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
Merged-In: I284f6308d456994bb72129cb0d7be7cd091993ae
2023-04-20 17:37:53 -04: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
Pranav Gupta
105610bdf0 Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false

Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-20 19:23:35 +00:00
Ibrahim Kanouche
397a9cf430 Update generateSPDXNamespace to generate a unique spdx doc namespace
Test: m compliance_sbom
Change-Id: Icc1e5aec0e1758ee32c43cfa79b5b49b3d1d9d30
2023-04-20 17:43:12 +00: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
Hang Lu
e235ded733 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.

Change-Id: I4493cb627fb564ee317eb95bd24ec020d42ae28c
2023-04-19 22:59:46 +00:00
Cole Faust
05bc3db3cd Create art_debug_opt_flag soong config variable
For use in art_debug_defaults.

Bug: 247785938
Test: See other cl in topic
Change-Id: I3d272b893ba05d65f21fdf65bf4f06dc172adfd8
2023-04-19 13:44:55 -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
Po Hu
81c3f4a884 Support to merge PREBUILT_IMAGES
For example, pvmfw.img comes from framework target files package
and dtbo.img comes from vendor target files package.

Test: merge_target_files
Change-Id: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
2023-04-19 08:23:40 +08: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
Steven Moreland
7275a19b5f envsetup: syswrite - wait after rooting
adb root sometimes takes a second, and the next command
will fail.

Bug: N/A
Test: syswrite on device which isn't already rooted
Change-Id: I91754c31c74bf0589ea8cbae77c10e5a120bdce5
2023-04-17 17:22:41 +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