Commit Graph

85413 Commits

Author SHA1 Message Date
Steven Moreland
e204a5cbf6 Merge "envsetup: syswrite - wait after rooting" am: 60588af876
Original change: https://android-review.googlesource.com/c/platform/build/+/2540971

Change-Id: I99d1952212d517b7f462f0175dfa7ed84b0f9a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:37:14 +00:00
Steven Moreland
60588af876 Merge "envsetup: syswrite - wait after rooting" 2023-04-24 21:53:22 +00:00
Joe Onorato
5f647df78d Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" am: 735320a9d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2556850

Change-Id: Ie384802be1ad23f293901c1fc4e766eb448785ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 21:31:52 +00:00
Colin Cross
d69b64d33f Update PLATFORM_VERSION to VP1A
Update PLATFORM_VERSION to VP1A.  The codename is now VanillaIceCream.

Bug: 279492191
Test: m checkbuild
Change-Id: Ibc24c10cf040407d79662c1819beaf97da791efb
Merged-In: Ibc24c10cf040407d79662c1819beaf97da791efb
2023-04-24 14:28:13 -07:00
Joe Onorato
735320a9d7 Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" 2023-04-24 21:06:57 +00:00
Treehugger Robot
28ecb7a712 Merge "rearrange app-related artifact path in make" am: 73d29f11b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2554553

Change-Id: I5f68611bc2ee8d0f3dfeb4a4faec03596c6695b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:50:30 +00:00
Treehugger Robot
73d29f11b8 Merge "rearrange app-related artifact path in make" 2023-04-24 18:24:36 +00:00
Treehugger Robot
34ff715849 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ic0850dc696ffac73aea5667dfc76a3e15f423cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 16:47:25 +00:00
Treehugger Robot
d88d79989d Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" 2023-04-24 15:55:24 +00:00
Treehugger Robot
59d4bb4a86 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Iae5c9827880227c5fe2a128050d5410665241f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 13:51:27 +00:00
Jeongik Cha
ba1b925e47 rearrange app-related artifact path in make
* move package-res.apk related files to "common" intermediate dir as
  aapt2.srcjar does because it is an app which is supposed to be arch
  neutral
* add device name in auto-gen RRO to avoid conflicits

Bug: 279358050
Bug: 279360102
Test: m
Change-Id: Ibcc5e5546bd43767ab0d4807933eeb57d58f99d6
2023-04-24 13:16:32 +00:00
Treehugger Robot
4a9b9b4d89 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" 2023-04-24 13:11:18 +00:00
Joe Onorato
9ba2f4d022 Save approx 18GB of RAM by not having a bazillion copies of the same modules names
Bug: 278864904
Test: treehugger, m, manual inspection
Change-Id: Ib564b3edf4a0523fc8231b8e57a5ba9c42a73294
2023-04-24 01:11:40 -07:00
Roman Kiryanov
d82931f9aa Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: Idd55d7f10bc178cfe716d173dbe59d2bed5fd963
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:52 -07:00
Roman Kiryanov
2d9385fd32 Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file
required if TARGET_COPY_OUT_X is set to
`product` or `system_ext`.

Bug: 111538404
Test: presubmit
Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:30 -07:00
Treehugger Robot
5970bf338b Merge "Fix incremental OTA generation failures" am: 5ca02ff114
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: I17880a243562b821a634715b242677de52ba6d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 02:04:12 +00:00
Cole Faust
b3e7b06662 Merge "Create art_debug_opt_flag soong config variable" am: 7740915dbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2549370

Change-Id: Ieedff309d9384c0a69a73833aa8ed042213bb54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 02:03:24 +00:00
Android Build Coastguard Worker
fc893fadc0 Version bump to TQ3A.230605.005 [core/build_id.mk]
Change-Id: I1a95eb366aefabd0dc3685c265dbcac57c4a95ac
2023-04-22 01:38:34 +00:00
Treehugger Robot
5ca02ff114 Merge "Fix incremental OTA generation failures" 2023-04-22 01:26:28 +00:00
Cole Faust
7740915dbf Merge "Create art_debug_opt_flag soong config variable" 2023-04-22 01:18:06 +00:00
Treehugger Robot
dba8e6640f Merge "Don't skip vndk finalization." am: 315e8b52ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2555112

Change-Id: I9e904fea56ee151042dd3f47b72da6e170f759f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:55:05 +00:00
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