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
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
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
Treehugger Robot
0f5090934f
Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main
2023-08-22 02:09:45 +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
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
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
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
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
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
Kelvin Zhang
0a1dd239cc
Move 16K kernel modules to /lib/modules/uname -r
_16k
...
Store 16K kernel modules in separate directory. This allows us to store
both 4k and 16k kernel modules in vendor_boot and have init load from
the right path.
Test: th
Bug: 293313353
Change-Id: I55cd33404defc71dfbd350517d2aa51bebdb3d06
2023-08-18 11:02:19 -07:00
Inseob Kim
30cbf0b853
Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN
...
Starting from Android V, vendor seapp_contexts files can't assign
coredomain to vendor apps, as it's Treble violation. This build broken
variable is to suppress the enforcement for devices launching with U or
prior.
Bug: 280547417
Test: set BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN := true and build
Change-Id: If4035e6cbd0c62a1111241d94ed0a3923f61247b
2023-08-18 18:13:54 +09:00
Alex Buynytskyy
1f9fe102a4
Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main am: 7109fe1822
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2657941
Change-Id: I1c6fee0ce48bcecfe07d1e8f236629cfd8360da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 22:14:25 +00:00
Alex Buynytskyy
7109fe1822
Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main
2023-08-16 21:27:21 +00:00
wufei3
99fafaec22
Remove the empty property of attestation.
...
In GSI images attestation specific properties
(ro.product.*_for_attestation) are empty, which causes attestation
failure on devices with different values in ro.product.* and
ro.product.vendor.* from actual values provisioned in Keymint.
Hence these values added only if they are set in build files.
Bug:294190893
Test: atest CtsKeystoreTestCases:android.keystore.cts.DeviceOwnerKeyManagementTest#testAllVariationsOfDeviceIdAttestation
Change-Id: Icaf1bcd089767b2c47d0b57064aa72a4c9483bb5
Signed-off-by: wufei3 <wufei3@xiaomi.corp-partner.google.com >
2023-08-16 15:39:29 +00:00
Jared Duke
69e90745fa
Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402
Change-Id: I264c182195f468ffdd86dcdf0049336a08da4160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 18:33:18 +00:00
Jared Duke
7e730893f1
Merge "Add global rule for -keepattributes Exceptions" into main
2023-08-15 17:45:57 +00:00
Jared Duke
3f2741215f
Add global rule for -keepattributes Exceptions
...
R8 full mode requires an explicit keep rule for keeping attributes for a
given target (class/method/member). As such, we can set the global rule
for keeping these attributes with minimal cost while reducing the
maintenance burden for adding incremental keep rules.
For a typical Android build, this adds <20KB total to the image.
Bug: 215530220
Test: m
Change-Id: Iad3de32e27da0ca93b618d8a203ee65bae0bb5d1
2023-08-15 15:48:35 +00:00
Ming-Chen Chung
08f1636468
Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353
Change-Id: I9d0cc91aa4827b4d50ccc49a29d355d86e95c4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 02:57:44 +00:00
Ming-Chen Chung
c2038e8e3d
Merge "Add update_device to be built and be packaged into otatools.zip." into main
2023-08-15 01:55:05 +00:00
Cole Faust
175b8f244d
Merge "Rename some variables in definitions.mk" into main am: 26acac7287
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513
Change-Id: Idfa2d255724d5b21e480e476aa3da6855713596e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 01:06:15 +00:00
Cole Faust
8e4024c872
Rename some variables in definitions.mk
...
Sublime text has an issue with their syntax highlighting, where it
looks for \s*define\b to indicate the start of a define block.
We had some variables that started with "define-", which match this
regex, which causes Sublime to be confused about where the defines
start and end. Rename the variables to work around this issue.
Test: m nothing
Change-Id: I997929606e2b0a8b086ad3b67a7ce1b5e99a7385
2023-08-14 15:28:05 -07:00
Joe Onorato
773e746119
Merge "Give an error when trying to build "next" targets" into main am: 23a778b361
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313
Change-Id: Ib224b23c64038453e52456696c4e900453a00b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 21:48:05 +00:00
Joe Onorato
23a778b361
Merge "Give an error when trying to build "next" targets" into main
2023-08-14 20:59:03 +00:00
Android Build Coastguard Worker
a637652154
Version bump to UP1A.230905.018 [core/build_id.mk]
...
Change-Id: I3e0fd68a280073c050f731454eb70fef912756bc
2023-08-14 19:53:23 +00:00
Android Build Coastguard Worker
cbd919cd8e
Version bump to UP1A.230905.017 [core/build_id.mk]
...
Change-Id: I1c219b93d42e314cf7bbd95b2b4f6c545d9e7b63
2023-08-14 18:33:17 +00:00
Juan Yescas
6c8e80a8c2
Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856
Change-Id: I21608557356122b16c4589c8bd4359e4df351562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 17:59:39 +00:00
Juan Yescas
dfa43734ac
Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main
2023-08-14 17:56:55 +00:00
Treehugger Robot
3aca2727b8
Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888
Change-Id: Id01aedc47d59e056f98c51a2530dd5e6a177228c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 17:14:20 +00:00
Treehugger Robot
66f7958fbf
Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main
2023-08-14 16:04:20 +00:00
Zhi Dou
22419904dd
Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155
Change-Id: I02694c4afa2e208baddb9ba80d04297bccb7674a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-14 14:59:34 +00:00
Zhi Dou
5f81b7dc96
Merge "aconfig: add default-permission argument for create-cache command" into main
2023-08-14 14:12:27 +00:00
Yu Liu
ea453c2c8d
Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main am: 50b31493f7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2705814
Change-Id: I80ec586bb2aaf0f074754dbd7587f6bf9c88b7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 22:26:58 +00:00
Yu Liu
50b31493f7
Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main
2023-08-11 21:40:01 +00:00
Yu Liu
affd00883f
Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL.
...
Bug: 289380707
Test: CI
Change-Id: Id201bda1bd4acfc6cadada982e20dee19d8c703a
2023-08-11 12:59:45 -07:00
Wei Li
c99c7e5358
Merge "Add SBOM metadata for symlinks in root directory so they can be included in product SBOMs." into main am: 1c263eb85a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2704535
Change-Id: I6970251313f3843b4512f9c74d4e57fdac65b2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 19:44:56 +00:00
Juan Yescas
24b02ed724
core: ARM 32-bit targets must be built with 4k elf alignment
...
- ARM 32-bit targets will be built with 4096 ELF alignment.
- ARM 32-bit targets will only support 4K Page sizes.
- ARM 32-bit targets won't be page agnostic.
Test: source build/envsetup.sh
lunch aosp_cf_x86_64_phone
m
Bug: 295550555
Change-Id: I1fda20ee06759cfe30e2e244616456d1ffa5ad66
2023-08-11 11:50:28 -07:00
Wei Li
1c263eb85a
Merge "Add SBOM metadata for symlinks in root directory so they can be included in product SBOMs." into main
2023-08-11 18:38:12 +00:00
Android Build Coastguard Worker
6812030d10
Version bump to UP1A.230905.016 [core/build_id.mk]
...
Change-Id: I50f2196892f9c9feadda9eec62efbb2932159e29
2023-08-11 06:48:05 +00:00
Juan Yescas
568707730c
Merge "core: Rename product variable Device_page_size_agnostic" into main am: 8358604c42
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2700957
Change-Id: I748cae4e5c8927603a613f4fe2c9b48ef418ac60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 06:46:55 +00:00
Juan Yescas
8358604c42
Merge "core: Rename product variable Device_page_size_agnostic" into main
2023-08-11 05:45:44 +00:00
Wei Li
517a13216e
Add SBOM metadata for symlinks in root directory so they can be included in product SBOMs.
...
Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Change-Id: I06e6716536c034dee3f6aa03469ad9ccc587dbd5
2023-08-10 18:11:06 -07:00
David Iserovich
bff2f544e9
Merge "[config] Dist supports custom super image script" into main am: 71d650c252
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2704153
Change-Id: I01d70572ae11fb4c27fdabb11b9e1a2c28d5342a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:34:03 +00:00
Zhi Dou
24a0b6a20c
aconfig: add default-permission argument for create-cache command
...
Aconfig set flag default permission as READ_WRITE regardless of the
release configuration. This change enables the caller of create-cache to
set the default permission for all flags, if the flag doesn't have a
value.
Test: atest aconfig.test
Bug: 294417368
Change-Id: I1ba19e1ba793cd2ae59923b136b9b50a92315ece
2023-08-10 21:39:59 +00:00
Ming-Chen Chung
ee3a191656
Add update_device to be built and be packaged into otatools.zip.
...
Change-Id: Ifd204a0d67815e4a443eb6c34c4545b2484bdf57
2023-08-10 19:57:58 +00:00