Commit Graph

86485 Commits

Author SHA1 Message Date
Inseob Kim
3875d6c82f Merge "Remove 28.0 compat support" 2023-04-07 00:52:30 +00:00
Alex Buynytskyy
7807b77323 Merge "Minor renaming and documentation." am: 0fce469f2d am: fc5ca8ba20
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606

Change-Id: I40840fd9119090bd1aaef0ba24121dabba086412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 00:34:03 +00:00
Alex Buynytskyy
fc5ca8ba20 Merge "Minor renaming and documentation." am: 0fce469f2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606

Change-Id: Ia81fe45c00af64542757847b29c35c64727e9121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 00:06:39 +00:00
Alex Buynytskyy
0fce469f2d Merge "Minor renaming and documentation." 2023-04-06 23:38:33 +00:00
Alex Buynytskyy
307d9bcfdf Minor renaming and documentation.
Bug: 276752264
Test: local run
Change-Id: I75814313a81ca041fa1461e48733bd40a020b777
2023-04-06 15:28:39 -07:00
Treehugger Robot
2918de2847 Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939 am: a0a725c18e
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I52180dcc092b24f6ac7e0470f81c69a39c766ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 22:09:23 +00:00
Treehugger Robot
a0a725c18e Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I21ef090d4b06ad872bf67b88605ee33023269a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 21:40:59 +00:00
Treehugger Robot
166753a939 Merge "Adapt to rearranged NDK sysroot." am: 40472c2371
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: Ied98c79a80e58530ea88a175cf6afb0053fdbaa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 21:12:27 +00:00
Alex Buynytskyy
3919502913 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef am: ddc0d018e8 am: f6729d2255
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: Ib581eb457cf2bedcca340256d7cd44d10269a7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 21:12:11 +00:00
Treehugger Robot
40472c2371 Merge "Adapt to rearranged NDK sysroot." 2023-04-06 20:46:41 +00:00
Alex Buynytskyy
f6729d2255 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef am: ddc0d018e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: I3dc73e46ea6d20c9c168663947f910ef5b7ba5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 20:43:51 +00:00
Alex Buynytskyy
ddc0d018e8 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: I566b18cdea420c719fc4e14c70bfbd12dd0279ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 20:15:32 +00:00
Alex Buynytskyy
f5b6dd80ef Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" 2023-04-06 19:52:00 +00:00
Roman Kiryanov
d7637446be Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS
PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled.

Bug: 277230251
Test: presubmit
Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad
Merged-In: Ie0234187fd4689211f0d4530f9b96027567273ad
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-06 12:25:35 -07:00
Roman Kiryanov
b790c9f1db Retire QEMU_USE_SYSTEM_EXT_PARTITIONS
always enabled

Bug: 277230251
Test: presubmit
Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74
Merged-In: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-06 12:18:28 -07:00
Roman Kiryanov
9e8e6a7329 Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64
aosp_64bitonly_x86_64 gets broken by the emulator
changes otherwise.

Bug: 277230251
Test: m
Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878
Merged-In: I31fed64619e26a1c690a6cf086c644757e45a878
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-06 12:17:24 -07:00
Jihoon Kang
b9feb06b56 Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e am: 10bc93a66e am: 398a89be8a
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: I1a0a94ca2b46dcbbffa9336c1a851d61df0b23e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 18:26:20 +00:00
Jihoon Kang
398a89be8a Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e am: 10bc93a66e
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: I57a7cf94a8cf5c48ee69a0f75b348087341d62e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 17:59:40 +00:00
Jihoon Kang
10bc93a66e Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: Ie9daa5fbe022330bdcc8c8293760be330035b494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 17:32:54 +00:00
TreeHugger Robot
975bbc523e Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp am: 6f523ecca3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22501717

Change-Id: Id180150b57c8875d27d3d43a039c3a1dc033f9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 17:28:50 +00:00
TreeHugger Robot
6f523ecca3 Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp 2023-04-06 17:12:33 +00:00
Jihoon Kang
0c76cab34e Merge "Specify list_files to be built with embedded launcher" 2023-04-06 16:54:02 +00:00
Hsin-Yi Chen
ebce0d9501 Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64
Because prebuilts/abi-dumps/ndk/current contains additional ABI dumps
that are not included in the finalization process, the script copies
only the subdirectory to the finalized ABI dump directory.

Test: ./finalize-sdk-rel.sh
Bug: 276503801
Change-Id: I76287cf110323baf40035a957564a1e8f39e8015
2023-04-06 14:01:07 +00:00
Jihoon Kang
8f6edbbf04 Specify list_files to be built with embedded launcher
In the current use case of list_files, the module is built with a
possibly incompatible host machine's python version. This change fixes
this by specifying module to be built with embedded launcher.

Test: m list_files
Bug: 277124374
Change-Id: Id894271042136c9db50e63852075a8c4ef36a71e
2023-04-06 05:25:20 +00:00
Vinh Tran
dc158cff8b 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
2023-04-06 00:44:03 -04:00
Treehugger Robot
3c1a2d8b33 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985 am: 407d194de4
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: I3c0c927ee3ad47dcd9e671f5343f30942b2faa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 22:51:10 +00:00
Treehugger Robot
407d194de4 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ic7d66f960673a8985c2535016f2da5ca07cb6b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 22:21:20 +00:00
Treehugger Robot
7171df5985 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ia91a20cf443d0a6a7c2cd72b9329319620718150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:52:00 +00:00
Ibrahim Kanouche
ac89d51673 Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 am: ac35dfa24a am: 52d2d30323
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: Ied78deea3a00db96edf23110c302d2818cfa136c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:36:09 +00:00
Treehugger Robot
eb081b1f23 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 am: 2ce394b862
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I102647695618c21ded0c6e694e289bd2c7fef0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:33:59 +00:00
Treehugger Robot
557a4d56c9 Merge "Quote the value of product mfr in case it contains space." 2023-04-05 21:20:18 +00:00
Ibrahim Kanouche
52d2d30323 Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 am: ac35dfa24a
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: I6714effcd6899c51feffe7f53b3247e17d3dcf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:06:14 +00:00
Treehugger Robot
2ce394b862 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I00951f29562d13a8fda6a97df96a00232978967a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:04:12 +00:00
Ibrahim Kanouche
ac35dfa24a Merge "Added Document Fields to SBOM generator" am: aeeea61aa0
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: Id8010c266ac0d7f915b093276e40b9f4c828d92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 20:50:59 +00:00
Ibrahim Kanouche
aeeea61aa0 Merge "Added Document Fields to SBOM generator" 2023-04-05 20:37:04 +00:00
Treehugger Robot
f2188a7994 Merge "Make android_certificate_directory public" am: 42bc8b9809
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I74a369c22d2427f871b01bd3cfc977cc46d688a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 20:34:48 +00:00
Treehugger Robot
42bc8b9809 Merge "Make android_certificate_directory public" 2023-04-05 19:40:51 +00:00
Kelvin Zhang
360ea743c6 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 am: c8e58a10a0 am: 3dc5fb7392
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: If7d132cb163e0b99940db1083c4daf17c1ec9013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 18:32:17 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list.
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
2023-04-05 11:06:40 -07:00
Kelvin Zhang
3dc5fb7392 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 am: c8e58a10a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Ic11be84be27ee80860202f387961de1e518f6ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 17:46:57 +00:00
Wei Li
5bb735bd95 Quote the value of product mfr in case it contains space.
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
2023-04-05 10:24:12 -07:00
Alex Buynytskyy
c3c48ca240 Set master finalization bug to 275409981.
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: builds
Change-Id: Iab70de07b5a46de0e2fd6b56c648c168ac0ebe6a
2023-04-05 17:23:57 +00:00
Kelvin Zhang
c8e58a10a0 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Id42a2d155af74eb7f885199d8761507216ceed03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 17:18:11 +00:00
Kelvin Zhang
3aa4644117 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" 2023-04-05 16:40:36 +00:00
Juho Kim
bcab31298c Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e am: 0c351860cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: Ib9851ae8860243b4797cbf2a9f27bf9734eec217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 09:32:16 +00:00
Juho Kim
0c351860cd Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 09:01:45 +00:00
Juho Kim
3d396b837e Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I65f143ea09fadea705973a639be296e39600d374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 08:32:33 +00:00
Wei Li
95561ab01c Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc am: 225a986e87
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: Iae6573b0c25cac36e7daf9bb116a0bff51dae1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 07:50:49 +00:00
Juho Kim
79e77ec4b5 Merge "Revert "Copy SBOM to dist directory when running "m dist"."" 2023-04-05 07:46:42 +00:00
Wei Li
225a986e87 Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: I73ec02bf070378ed9994e88cb6f016e9de32bb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 07:13:27 +00:00