StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,771 Commits 1 Branch 0 Tags
4cb15ae345c05a0862a6c0cb6ae7a669f6dc6b64
Commit Graph

35817 Commits

Author SHA1 Message Date
Cole Faust
9ff7a37096 Don't read the odex zip files when building sbom-metadata.csv 
The files inside the odex zip files are now part of $(installed_files)
as of aosp/2729625.

Bug: 205632228
Test: m out/target/product/emulator_x86_64/sbom-metadata.csv, before this cl you can find duplicate entries for the odex files. After this cl there's only 1
Change-Id: I1645bd1bb9e1f10fc3746225a15b8431b666580e
 2023-08-29 15:39:10 -07:00
Cole Faust
44780b4d82 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643 am: 377f554483 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625

Change-Id: I8042bc18604698de0a70abd43d5c9a87e3309592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:20:41 +00:00
Cole Faust
377f554483 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625

Change-Id: I60ad04622bfd6fde210957916634b749f1f914c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 03:29:49 +00:00
Cole Faust
303d7da643 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main 2023-08-29 02:46:09 +00:00
Treehugger Robot
54dead2799 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 am: d6e3f50ed0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: I20466508fb686e4819e7dd04a2460aa919e75b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 02:45:45 +00:00
Treehugger Robot
d6e3f50ed0 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: Ib240dec2e031f1e5f6ba650c7a9dada63282fad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:56:09 +00:00
Cole Faust
a220e4596f Add dexpreopt files to ALL_MODULES.$(m).INSTALLED 
We're trying to make FULL_SYSTEMIMAGE_DEPS more accurate to remove the
need for `m installclean`. The dexpreopt files did not show up in
FULL_SYSTEMIMAGE_DEPS, because they were installed with a custom
post-install command.

The dexpreopt implementation is shared between soong/make, which means
a lot of it happens at execution time for make. However, we have enough
information to guess what files to install will be inside the zip file.

Add an execution-time check that our guess is correct, and then add
the guessed files to `ALL_MODULES.$(m).INSTALLED`.

This also allows us to remove the post-install command, and just
generate rules to install the files we want directly.

Bug: 205632228
Test: full build on an internal product that uses dex-preopted make modules
Change-Id: I57db58e4587e3e198ec650c6fb39a908e4ec6993
 2023-08-28 18:12:30 -07:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Inseob Kim
3c7b91bac1 Use board api level for seapp coredomain check 
Rather than PRODUCT_SHIPPING_API_LEVEL, use board api level
(BOARD_API_LEVEL or BOARD_SHIPPING_API_LEVEL) to determine whether we
check coredomain violations or not.

Also provides a Makefile variable to override the flag, for targets that
want to turn on the check optionally.

Bug: 280547417
Test: see build command of vendor_seapp_contexts
Change-Id: I177630d33313334ca4a56a9be88b78cff678281e
 2023-08-28 07:33:12 +00:00
Jooyung Han
ea6b3e5018 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I12bbafad67e538b82987271f29af47c548b975f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:49:52 +00:00
Jooyung Han
db3c1b173f Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:03:27 +00:00
Jooyung Han
5d7f9cb2a1 Merge "Remove TARGET_FLATTEN_APEX" into main 2023-08-28 00:32:35 +00:00
Treehugger Robot
46293a1a4e Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 am: d3cfff21f4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I58dd6c8a804a2a71e8e7bdded6eeee9325484b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 20:31:23 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
 2023-08-25 13:25:26 -07:00
Treehugger Robot
d3cfff21f4 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I57108c8b3aabfd4be81b4b986db6abd86e160ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:47:18 +00:00
Treehugger Robot
8cf849c86c Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd am: 2a6a71476b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ic7d6055191710893d852c2a266e987b336d60a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:07:35 +00:00
Treehugger Robot
8c3bb5b993 Merge "Fix 16k ota package build failures on pixel" into main 2023-08-25 18:50:34 +00:00
Treehugger Robot
2a6a71476b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ifbb87b7a8740f076075ea3aa1b05fab5326015f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:51 +00:00
Treehugger Robot
510e0f2cbd Merge "Use platform built lz4 tool rather than system copy" into main 2023-08-25 17:48:13 +00:00
Kelvin Zhang
e9f4ce4368 Fix 16k ota package build failures on pixel 
boot_ota_16k.zip relies on build_boot_from_kernel_avb_enabled. But that
makefile function is guarded by $(BOARD_PREBUILT_BOOTIMAGE). Pixel
defined BOARD_PREBUILT_BOOTIMAGE, which causes
build_boot_from_kernel_avb_enabled to be undefined, resulting in build
failure.

Test: th
Bug: 293313353
Change-Id: I5b01e9bf7fedd9c508f476bc243d860dc48c5ebb
 2023-08-25 10:41:48 -07:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
 2023-08-25 15:06:20 +09:00
Treehugger Robot
255f2cb464 Merge "Skip building compat files if REL" into main am: b531ccf36e am: 695570c064 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I1d53e235d59ee0e99dda0b8e49045432969cf8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 05:30:07 +00:00
Kiyoung Kim
3747299783 Do not set ro.(product.)vndk.version if VNDK is deprecated 
ro.(product.)vndk.version should be empty when the VNDK is deprecated.
This change skips property set up when KEEP_VNDK flag is false. Device
can check if VNDK is deprecated with ro.(product.)vndk.version property.

Bug: 290159430
Test: aosp_cf_x86_64_phone build and boot succeeded.
Change-Id: Ia02fb33137c8df456fda87b5b769cfb940349747
 2023-08-25 14:05:06 +09:00
Treehugger Robot
695570c064 Merge "Skip building compat files if REL" into main am: b531ccf36e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I60db50f0f2bb3a09db3793447f5c08ce186df784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 04:45:29 +00:00
Treehugger Robot
b531ccf36e Merge "Skip building compat files if REL" into main 2023-08-25 04:29:28 +00:00
Inseob Kim
9b2631d11a Skip building compat files if REL 
In release build, we don't need to (and shouldn't) build compat files,
because it doesn't make sense to build compat files for itself.
Currently this didn't happen because REL build only happens on -dev
branches. To support main branch setting REL, filtering out
PLATFORM_SEPOLICY_VERSION from compat versions list.

Bug: 296780580
Test: build with next
Change-Id: Ia5c09a1c9b4209ed82dc66307d57decb4f442477
 2023-08-25 04:29:09 +00:00
Kelvin Zhang
19c36a5ee7 Use platform built lz4 tool rather than system copy 
Test: th
Bug: 293313353
Change-Id: I22d5b6906dfd30f947eaa06d6196cdf560c50722
 2023-08-24 18:10:24 -07:00
Treehugger Robot
2760e3dd45 Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 am: c7c9a58f1a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: I830a8106c9a9fbdf674355c52b787e3a84428b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 00:10:03 +00:00
Treehugger Robot
97d2062eae Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 am: efe267a36e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I335a429714055bf0e3e780ef032f321d476ad442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 00:09:28 +00:00
Treehugger Robot
c7c9a58f1a Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: Ibbf56901bd431009ebddca3254e01787ebb7e827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:47 +00:00
Treehugger Robot
efe267a36e Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I52a1c19da7b8a5a99c8ae1709c41e6688befb118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:15 +00:00
Kelvin Zhang
9113badc39 Fix 16K page size kernel config check 
Non 16K kernels might have "CONFIG_ARM64_16K_PAGES is not set" string in
kernel config, properly handle this case.

Test: th
Bug: 293313353
Change-Id: I1a9582503c5fd20b8dcf95406166df7e11940424
 2023-08-24 14:26:23 -07:00
Kelvin Zhang
6257eb2144 Add a 16K boot partition OTA target 
This OTA will be used to switch real devices to 16K kernel

Test: th
Bug: 293313353
Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f
 2023-08-24 13:44:59 -07:00
Android Build Coastguard Worker
5d96c39bf7 Version bump to UP1A.231005.003 [core/build_id.mk] 
Change-Id: Iaed05b0b542d0b11708de7f904901f3ec946e622
 2023-08-23 21:40:03 +00:00
Treehugger Robot
87e7f90cc0 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 am: 0d7abde2c0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: If611f221d573d3996c5324377afc9f3a7e8b19a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:51:58 +00:00
Treehugger Robot
0d7abde2c0 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: I4077056f6a63d150fc51dd38a94610cfcccb33c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:12:35 +00:00
Treehugger Robot
8676bb08af Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I9b248d401a5f81e5e194fc9e8ee8903ecd80bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 06:36:47 +00:00
Treehugger Robot
a679e050f5 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main 2023-08-23 06:34:31 +00:00
Treehugger Robot
5403b178a8 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I6432991fbba4be0e4f013478ac353452b94f26d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 05:56:36 +00:00
Treehugger Robot
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Inseob Kim
a26d098160 Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" 
Revert submission 2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Reason for revert: not needed

Reverted changes: /q/submissionid:2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Change-Id: Ib8612049314dbe26a913cc97b8c835fad4f03824
 2023-08-23 02:07:53 +00:00
Treehugger Robot
9966ca169f Merge "Build a boot image for 16K kernel" into main am: 6a2e73c3bb am: 21280589af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719320

Change-Id: I5c1ab74d2000819f37854130b3b902936ffd40dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 19:23:17 +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
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
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
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
2394053656 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f am: 013135c684 
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817

Change-Id: I54abbaae80bbec143c4e74a706a16c5d4a1ee633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 03:32:47 +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