Commit Graph

92736 Commits

Author SHA1 Message Date
Devin Moore
0b69afa338 Revert "Remove android.hidl.memory library from the VNDK"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: Ie55fd1d0b8429a17966755ec1c54b2868ca966f9
2023-11-13 19:32:46 +00:00
Devin Moore
77393ba39d Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: I1065d67949c4270d5351a9ca00ec79ead845020d
2023-11-13 19:32:54 +00:00
Devin Moore
a764ffffdd Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba am: b29721f486
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: I555017d4816005363581394de92a71f4618b07ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:31:25 +00:00
Devin Moore
3c2da0df99 Remove android.hidl.memory library from the VNDK am: 4859a6a250 am: 60684f109d
Original change: https://android-review.googlesource.com/c/platform/build/+/2818338

Change-Id: I2333499a8c436b3b70771df7f72365db6af6fd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:31:21 +00:00
Devin Moore
9cb1b74911 Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba am: 7622538d1c
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: Ieed4ae9fda8890cf1a828e61ef88c43fbde57f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:29:08 +00:00
Zi Wang
2b09495e2a Merge "Update test: true to mode: "test"" into main 2023-11-13 19:23:55 +00:00
Devin Moore
7622538d1c Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: Id79bd6d0bdba7006fee6f1b261155f264c13d812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:02:56 +00:00
Devin Moore
b29721f486 Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: I2d9d0e146ab59d4a2fe96638e356825d234202ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 18:57:16 +00:00
Devin Moore
60684f109d Remove android.hidl.memory library from the VNDK am: 4859a6a250
Original change: https://android-review.googlesource.com/c/platform/build/+/2818338

Change-Id: Iefd51fa05c3110c616c4017157093045bdfe7f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 18:57:12 +00:00
Devin Moore
001ed67bba Merge changes from topic "remove_hidl_memory" into main
* changes:
  Stop including android.hidl.memory ashmem impl on V+ devices
  Remove android.hidl.memory library from the VNDK
2023-11-13 17:55:30 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Colin Cross
68de89c4eb Merge "Escape sbom lines" into main am: 70ed34cc72 am: 4bd43459ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: Icc4bec7d1e8d1fbad26fbd644849f57b080774f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 04:41:52 +00:00
Colin Cross
8736c21a1f Merge "Escape sbom lines" into main am: 70ed34cc72 am: 7523abc4e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: I69e63159ffb7c4ccc9e6db874108140c95a19a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 04:40:00 +00:00
Colin Cross
7523abc4e1 Merge "Escape sbom lines" into main am: 70ed34cc72
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: I752a0a0e5ac53dd24a797259529aa66d72c13e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 03:52:29 +00:00
Colin Cross
4bd43459ea Merge "Escape sbom lines" into main am: 70ed34cc72
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: If4f0acc2ce978a83e6c2527080de24584dbc3b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 03:52:28 +00:00
Colin Cross
70ed34cc72 Merge "Escape sbom lines" into main 2023-11-11 03:22:11 +00:00
Colin Cross
92f8043874 Escape sbom lines
Go 1.21 changes the names of some factory functions to include
characters that need shell escaping.  Wrap everything written to
the sbom file with single quotes.

Bug: 309895579
Test: m out/target/product/vsoc_x86_64/sbom-metadata.csv
Change-Id: Ia61f02d8b02dd9f92ce144307087423c592a1833
2023-11-10 15:06:21 -08:00
Treehugger Robot
ab54b8cbb0 Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 4f0489ae6e
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I168f0fe51a24588622bc346e4853b015ef3c6d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:54:15 +00:00
Jiakai Zhang
4a89c919d4 Update dexopt system properties. am: 7707456104 am: b4eb76c827
Original change: https://android-review.googlesource.com/c/platform/build/+/2817439

Change-Id: Ie8f874e1363688ea545ff546eac4a32a57a7057d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:54:11 +00:00
Treehugger Robot
6bb3bee4ba Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 84d00a4ff6
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I1a18cc6b08879b0beab6527940b2c353a42821b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:52:08 +00:00
Treehugger Robot
4f0489ae6e Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: Idf689b6c79faddf383f905049c57aee5e548771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:13 +00:00
Jiakai Zhang
b4eb76c827 Update dexopt system properties. am: 7707456104
Original change: https://android-review.googlesource.com/c/platform/build/+/2817439

Change-Id: I9388910df0ce36fe0a3e9de3d116c5a296c8b98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:07 +00:00
Treehugger Robot
84d00a4ff6 Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I3d4007a6aea280118df9cb0073478a497d01590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:18:23 +00:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
2023-11-10 18:47:19 +00:00
Treehugger Robot
6b9df995de Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec am: 2f58937935
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: I5521f38a261d75ae8e5b2108455d6bf32ebb2dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:57:24 +00:00
Treehugger Robot
8778b9a501 [automerger skipped] Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c am: 2da3e94603 -s ours
am skip reason: Merged-In I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5 with SHA-1 04531b5c79 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2826010

Change-Id: Ib35220a0c5fee5bf8988c628d3615985ed0f0e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:57:15 +00:00
Treehugger Robot
fa2e92ad5f Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec am: 0049761888
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: I0bc80d655096209521110d21f3efcf375f4a7854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:55:43 +00:00
Treehugger Robot
12d0045266 Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c am: 0a7b4ebd66
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010

Change-Id: Ieadf4caa198f5189f08374130ab5ac28adb2c166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:55:30 +00:00
Treehugger Robot
0049761888 Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ibd220ff1a38643d437a363c3a930c02eade12f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:59 +00:00
Treehugger Robot
2f58937935 Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ia1096d264ee4cb2927d3cfc854078d7cb67da48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:56 +00:00
Treehugger Robot
0a7b4ebd66 Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010

Change-Id: Ic4d8d9a155f34b5b8c05c61b60e9b74e05646fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:45 +00:00
Treehugger Robot
2da3e94603 Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010

Change-Id: Iee8d5bfff8811623488dfdfcf5fbf63c1bfd6568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:44 +00:00
Treehugger Robot
1f9ba9c4ec Merge "Don't build VNDK on GSI" into main 2023-11-10 09:04:16 +00:00
Treehugger Robot
4e7ba9e30c Merge "GSI: add VNDK 34/remove VNDK 29" into main 2023-11-10 08:31:14 +00:00
Hung-ying Tyan
d116600dc1 Don't build VNDK on GSI
Bug: 308878144
Test: manual mix on T Pixel 6

Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
2023-11-10 08:01:59 +00:00
Hung-ying Tyan
04531b5c79 GSI: add VNDK 34/remove VNDK 29
Bug: 291204040
Test: boot GSI on U Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4639705bdf86c8b8c1607719eab4f5791e236fe)
Merged-In: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-11-10 08:00:56 +00:00
Colin Cross
6b6f1bd694 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c am: d7f59ea0c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: Iad94a8cf591f412c680041fab5ce107f4eeb5924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:46:54 +00:00
Colin Cross
3f818b17e0 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c am: d8be2bfeef
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: I8b82a223b41e2f37add238edcc51a7fd8ae28807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:44:46 +00:00
Justin Yun
23d52435f3 Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN
BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN are set by the release
flags.
BOARD_API_LEVEL sets ro.board.api_level that shows the API level of
the vendor API surface.
BOARD_API_LEVEL_FROZEN sets ro.board.api_frozen that shows if the
ro.board.api_level is finalized.

Bug: 295269182
Test: getprop ro.board.api_level
Change-Id: Ie57c57b6c9f1fc0c98968195843059a48da8e512
2023-11-10 16:31:04 +09:00
Colin Cross
d7f59ea0c9 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: Iebaf6e894b8131cc7ef9f5ba091b3e974f5407de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:56 +00:00
Colin Cross
d8be2bfeef Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: I91ee4c153dd76c4d66ba3e14eb769610233cf129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:51 +00:00
Colin Cross
481b02106c Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main 2023-11-10 06:15:45 +00:00
Treehugger Robot
09b2fe67c8 Merge "Prevent using symlinks to starlark files" into main am: 124101862b am: 3e1b4de768
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818

Change-Id: I273ba5d9b9235a6af193df0c4fc82b0717f389fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 01:22:04 +00:00
Treehugger Robot
f027dee3fc Merge "Prevent using symlinks to starlark files" into main am: 124101862b am: 5ddf4a3006
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818

Change-Id: I2a51939771f153a16440bb78630b1ff16d279334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 01:19:33 +00:00
Treehugger Robot
3e1b4de768 Merge "Prevent using symlinks to starlark files" into main am: 124101862b
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818

Change-Id: Ie2d70f0cacaa31475256d5d6471fd74edb548097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:48:50 +00:00
Treehugger Robot
5ddf4a3006 Merge "Prevent using symlinks to starlark files" into main am: 124101862b
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818

Change-Id: Ie8b9274d39ceba0892e90b788afa00b8ab3066e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:45:45 +00:00
Zi Wang
0ab8a96dcf Update test: true to mode: "test"
Test: CI

Bug: 309990433
Change-Id: I31644510002560fd81c41fbe37f0872fc1135390
2023-11-09 16:33:39 -08:00
Juan Yescas
01cd459cc9 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 am: f476e19d72
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: I49d2e1c416242bb18195427f375c3a7416c148dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:02:28 +00:00
Treehugger Robot
124101862b Merge "Prevent using symlinks to starlark files" into main 2023-11-10 00:00:41 +00:00
Juan Yescas
3675aaf529 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492 am: 1b51f6ec38
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: I2925660bae1ab5568048fea13c2511c3b8078e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:59:59 +00:00