Commit Graph

89792 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
e41e485961 [coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
COASTGUARD_SKIP: Ie009dd8946969a814192f10fe780eed1229eff52

Change-Id: I17560fc587a1f4ea427587514e7be5d692a33b03
2023-08-22 21:16:28 +00:00
Android Build Coastguard Worker
b95cbe81f4 Version bump to UP1A.231005.002.A1 [core/build_id.mk]
Change-Id: Ie009dd8946969a814192f10fe780eed1229eff52
2023-08-22 21:12:10 +00:00
Cole Faust
075d9622ff Ignore vndk compat symlinks in artifact path requirements
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
2023-08-22 11:58:17 -07:00
Treehugger Robot
21280589af Merge "Build a boot image for 16K kernel" into main am: 6a2e73c3bb
Original change: https://android-review.googlesource.com/c/platform/build/+/2719320

Change-Id: I46a2557ebcea05586d5bc45bd12c1a039101a38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 18:44:31 +00:00
Kalesh Singh
7e0aa04637 zipalign: Fix pageAlignSharedLibs arg in tests
zipalign_test is passing (int)4096 instead of required bool
for the pageAlignSharedLibs parameter. Update the test to use
the correct type.

Bug: 276963821
Test: atest -c zipalign_tests
Change-Id: I4150dbd411e5a40427281645aa03262f7b0c9e3a
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-08-22 11:26:23 -07:00
Tomislav Novak
d8febc98b3 make: HWASan exclude path support
Like aosp/2495518, but adds the ability to centrally disable HWASan
for multiple modules when building with SANITIZE_TARGET=hwaddress.

HWASan takes precedence over CFI and several other sanitizers that it's
incompatible with[1], which can be problematic for modules that require
those sanitizers (e.g. those that depend on vendor prebuilts where only
sanitized variants are provided). This patch adds an easy way to disable
HWASan for such modules while still keeping it globally enabled.

Test: build with HWASAN_EXCLUDE_PATHS set and verify with readelf that
      relevant modules have no references to __hwasan symbols

[1] bb31ca1168/core/config_sanitizers.mk (236)

Change-Id: I64185b570bc64e61680c3212934a02d80a4904b9
2023-08-22 18:15:04 +00:00
Treehugger Robot
6a2e73c3bb Merge "Build a boot image for 16K kernel" into main 2023-08-22 18:07:06 +00:00
Android Build Coastguard Worker
dce918fb6b Version bump to UP1A.231005.002 [core/build_id.mk]
Change-Id: I6809b6fd2a73df597d498637d4b7971f71d3ec75
2023-08-22 16:45:23 +00:00
Yihan Dong
33ca96ab66 Merge "Create the TEST_MAPPING file" into main am: 8c0cb8f5e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2719153

Change-Id: I451328541a8084229a1229cbeb72f8f632d348b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 08:56:16 +00:00
Yihan Dong
8c0cb8f5e3 Merge "Create the TEST_MAPPING file" into main 2023-08-22 08:39:36 +00:00
Himanshu Jakhmola
21ef2c600b Avoid calling MergeUpdateEngineConfig for non-ab target
super image generation is failing for non-ab target as it is not able to find update_engine_config.txt while calling MergeUpdateEngineConfig.

META/update_engine_config.txt exists when AB_OTA_UPDATER is true.
Avoid calling MergeUpdateEngineConfig for non-ab target.

Bug: 290811619
Change-Id: Ie88b31adce15df87f73031e1f5bff0d825601e0c
2023-08-22 04:08:01 +00:00
Kelvin Zhang
cde8734295 Build a boot image for 16K kernel
This image can be used to switch the device to 16K kernel.

Test: th
Bug: 293313353
Change-Id: Iea3ad29e0b3789f0c499004f3f346ab3c460f39e
2023-08-21 21:05:43 -07:00
Chun-Yi Lee
b704f738af Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I2d686e4603e5451efff3d82ea5c323e5672c54bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 02:56:57 +00:00
Treehugger Robot
013135c684 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817

Change-Id: I458874b2327622847f9a7c0fe06a6452cef36d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 02:55:57 +00:00
Android Build Coastguard Worker
61c0b9d4a8 Make change and version bump to UP1A.231005.001
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24426147'] into udc-release.

Change-Id: Ib3d9194075fb34f357428898ec890187e302d5fe
2023-08-22 02:20:39 +00:00
Chun-Yi Lee
6f09d105ef Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main 2023-08-22 02:11:23 +00:00
Lokesh Kumar Goel
c94178c9f6 Update Security String to 2023-10-05
Bug: 295937899
Ignore-AOSP-First: Internal first as its needed for preparing the release
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bb28383f498c2602ca2e9bd1c686523882d384a1)
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
2023-08-22 02:11:01 +00:00
Treehugger Robot
0f5090934f Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main 2023-08-22 02:09:45 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements"
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
2023-08-22 01:18:51 +00:00
Cole Faust
1b107d4b5f Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I6c0f11717ecf654b8060fb87aea35ee2ad4cf441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:15:24 +00:00
Treehugger Robot
a865decd76 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: Ic2ae64ee5c1ad43cfd2341d41f0d808063aec896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:14:51 +00:00
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +00:00
Treehugger Robot
de9df1dcf6 Merge changes I2920d8b0,I55cd3340 into main
* changes:
  Add 16K ramdisk to vendor_boot
  Move 16K kernel modules to /lib/modules/`uname -r`_16k
2023-08-21 21:32:02 +00:00
Cole Faust
f7554e3735 Ignore vndk compat symlinks in artifact path requirements
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07:00
Treehugger Robot
a0bfc6a05e Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: Ibcacfc6230a0fdef46e4662c79faa4b2ee6adb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 17:09:13 +00:00
Kangping Dong
1fb1dd701c Revert "add com.android.threadnetwork to base_system.mk"
This reverts commit 286e55ad94.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: Id601ab8b6f160d8fc2b7a9720652842cc2c194ba
2023-08-22 00:51:40 +08:00
Treehugger Robot
f7171f4dff Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main 2023-08-21 16:30:53 +00:00
Eran Messeri
e24afe8cfb Merge "Remove the empty property of attestation." into main am: 66832f6525
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I96218b2a21c805a6c193a2f5692100d5d5f2a3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:56:45 +00:00
Eran Messeri
66832f6525 Merge "Remove the empty property of attestation." into main 2023-08-21 14:34:49 +00:00
Treehugger Robot
84b3f07b31 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: Ide1a1cdad902fff2b3385b00f3c047251304dea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 14:23:11 +00:00
Treehugger Robot
a3cd7dcd29 Merge "Add dependency for combined aconfig files" into main 2023-08-21 14:08:00 +00:00
Yihan Dong
c2b7632423 Create the TEST_MAPPING file
Add FlagMacrosTests in presubmit to ensure that test filtering rule
always work as expected.

Bug: 292707070
Test: atest --test-mapping
Change-Id: I7a08b7e41e95063fb3c188da784f56e0973d4fae
2023-08-21 17:23:14 +08:00
Joe Onorato
03d53f7d2d Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile.
The aconfig-generated code in the framework is added with srcjars. To
get those srcjars, we still need a java_aconfig_library.  This class is
there to allow that to compile, even though those compiled .jar files
are not actually used.

Bug: 293195086
Test: m
Change-Id: I34c21925fbc5912a34fea3e7796d5e0c77c9a4af
2023-08-20 07:40:44 -07:00
Android Build Coastguard Worker
e194bcad19 [coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L22000000962658982 into udc-release.
COASTGUARD_SKIP: Ib437ebfe276de1995b48a7a7756ed43f857f85e8

Change-Id: I114fb0c1e435e361114d80dac6ff018779ecf97f
2023-08-20 08:35:55 +00:00
Android Build Coastguard Worker
544be10b2a Version bump to UP1A.230905.019.D1 [core/build_id.mk]
Change-Id: Ib437ebfe276de1995b48a7a7756ed43f857f85e8
2023-08-20 08:32:03 +00:00
Android Build Coastguard Worker
cf041d064a [coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L90500000962658543 into udc-release.
COASTGUARD_SKIP: Ie9412f70ca03942d4002336f77d9325f4816eb7c

Change-Id: Id9bdadf89e9e2e58e1c0b7497122c1e575fab486
2023-08-20 08:14:08 +00:00
Android Build Coastguard Worker
120664e3c0 Version bump to UP1A.230905.019.C1 [core/build_id.mk]
Change-Id: Ie9412f70ca03942d4002336f77d9325f4816eb7c
2023-08-20 08:10:32 +00:00
Android Build Coastguard Worker
0e66565bba [coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L11100000962655815 into udc-release.
COASTGUARD_SKIP: I18cb393ba80cd51cd0f4cbb1d5c08dafeda86e9a

Change-Id: Ib61970c93a9c3eec2018d7c6974278be73b208ef
2023-08-20 07:53:00 +00:00
Android Build Coastguard Worker
44d237b497 Version bump to UP1A.230905.019.B1 [core/build_id.mk]
Change-Id: I18cb393ba80cd51cd0f4cbb1d5c08dafeda86e9a
2023-08-20 07:45:47 +00:00
Android Build Coastguard Worker
e5f4de7ad9 [coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L61400000962657635 into udc-release.
COASTGUARD_SKIP: If7a33186dcacfafc7f41b737f2fa25f84fd846fd

Change-Id: Ie67b1101411451115f92a1cfae2b9145946a3ed1
2023-08-20 07:33:56 +00:00
Android Build Coastguard Worker
e77acaee06 Version bump to UP1A.230905.019.A1 [core/build_id.mk]
Change-Id: If7a33186dcacfafc7f41b737f2fa25f84fd846fd
2023-08-20 07:29:34 +00:00
Android Build Coastguard Worker
69a4f81be8 Version bump to UP1A.230905.019 [core/build_id.mk]
Change-Id: I3f97b4ec14d6c9f30bc9aa8691e7f3207e94539b
2023-08-20 07:07:20 +00:00
Joe Onorato
b209349689 Add dependency for combined aconfig files
Bug: 293436986
Test: manual
Change-Id: I1d358faf9a0a3a83a92646c7cf7194c17ad2331e
2023-08-19 19:03:28 -07:00
Treehugger Robot
9488c6c0ea Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I7baffb4010a2d8032cd842919e22efd31fe5d316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 23:39:08 +00:00
Treehugger Robot
987e6ba3f2 Merge "Don't check the codename for REL configuration." into main 2023-08-19 23:22:44 +00:00
Alex Buynytskyy
be87e19e67 Don't check the codename for REL configuration.
Bug: 294161396
Test: m
Change-Id: I905801fdb6520b430f15f219ae4cd89be74065a5
2023-08-19 00:07:16 +00:00
Android Build Coastguard Worker
d5f377693a [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L08900000962649037 into udc-release.
COASTGUARD_SKIP: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98

Change-Id: Ice787c445e6212dbb894940f6e06d425716484d3
2023-08-18 19:56:32 +00:00
Android Build Coastguard Worker
11526dd437 Version bump to UP1A.230905.016.Z1 [core/build_id.mk]
Change-Id: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98
2023-08-18 19:52:46 +00:00
Alex Buynytskyy
cb3170eda4 Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: If91f6692ebd555b718bb013dbad1dd7cae8a79a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 18:09:39 +00:00
Kelvin Zhang
b71bc1bcde Add 16K ramdisk to vendor_boot
Store both 4K and 16K kernel modules in vendor_boot, this allows the
device to switch between two kernels easily.

Test: th
Bug: 293313353
Change-Id: I2920d8b0fe762defe273912efa89bc1b5642fdb2
2023-08-18 11:09:06 -07:00