Commit graph

84235 commits

Author SHA1 Message Date
Dennis Song
7ffe8ab317 Merge "Support merging target files from directory" am: a0ffed1fa1 am: 609dd3b00f
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: I4fe623e0f07875ca112b593e83c00c048ceb436d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 06:51:03 +00:00
Dennis Song
609dd3b00f Merge "Support merging target files from directory" am: a0ffed1fa1
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: I48d18bac60b3c9dc3aa2636437cd421a0efcfe11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 06:06:55 +00:00
Dennis Song
a0ffed1fa1 Merge "Support merging target files from directory" 2023-04-11 05:40:05 +00:00
Treehugger Robot
fab0963700 Merge "Allow setting future api level before REL" am: 52fdcf5457 am: 9358c91d08
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I9d22b49d076d6bf57b409c2871b01da79294ab70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 01:20:50 +00:00
Treehugger Robot
9358c91d08 Merge "Allow setting future api level before REL" am: 52fdcf5457
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I71f5e276257d16b1df32d762599d13a9f97f24aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 00:50:10 +00:00
Treehugger Robot
52fdcf5457 Merge "Allow setting future api level before REL" 2023-04-11 00:09:23 +00:00
Roman Kiryanov
3d0eaa9fa1 [automerger skipped] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS am: d7637446be -s ours
am skip reason: Merged-In Ie0234187fd4689211f0d4530f9b96027567273ad with SHA-1 6a4773340a is already in history

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

Change-Id: Ide139364799bc23085f57bae55d4bdc75f97e428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:51:42 +00:00
Roman Kiryanov
721bee4bbf [automerger skipped] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS am: b790c9f1db -s ours
am skip reason: Merged-In Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 with SHA-1 6715e76360 is already in history

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

Change-Id: I51f7b4dbec42a890dc3e5e6b582be614cb78134e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:51:30 +00:00
Roman Kiryanov
b97a105522 [automerger skipped] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 am: 9e8e6a7329 -s ours
am skip reason: Merged-In I31fed64619e26a1c690a6cf086c644757e45a878 with SHA-1 fd5e673f9f is already in history

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

Change-Id: I063caa8ad7234cff47e1c02a4aaa19496c9cb64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:51:11 +00:00
Treehugger Robot
7c93b50eca Merge "Check if an installed file exists and report error if not." am: 0bbde41728 am: 9d38ce9784
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: If6ae7c5d886b560a9e6bc67690e30e8c18b2459b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:17:50 +00:00
Treehugger Robot
9d38ce9784 Merge "Check if an installed file exists and report error if not." am: 0bbde41728
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: Id2cea3cfa9d23671c659070bd505005b254b170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 18:25:34 +00:00
Treehugger Robot
0bbde41728 Merge "Check if an installed file exists and report error if not." 2023-04-10 17:49:32 +00:00
Dennis Song
5bfa43e5eb Support merging target files from directory
Expand `merge_target_files.py` API capabilities so that
`--framework-target-files` and `--vendor-target-files`
can be either zip archives or directories.

Test: Create a merged package by vendor target files folder
Test: atest --host releasetools_test
Bug: 276068400
Change-Id: I200be2a458ae59a61e05bfd7c78ab66093db32eb
2023-04-10 17:07:03 +08:00
Jooyung Han
ac1368846a Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 09:02:48 +00:00
Jooyung Han
ac31a9eee0 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: If536c973715525433053fa48cb42a456256db41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:19:40 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00:00
Justin Yun
870ea2e188 Allow setting future api level before REL
At the dev stage, devices may set ro.board.(first_)api_level to the
future API level

Bug: 276927022
Test: test_post_process_props.py
Change-Id: I85c29af74ed8daa780278f64b023480bb6659781
2023-04-10 15:37:19 +09:00
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
2023-04-10 04:02:06 +00:00
Treehugger Robot
b01b05bf69 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 04:37:42 +00:00
Treehugger Robot
85d032fb46 Merge "Remove device.mk" am: 3665d8dfa8
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: I0ccce688a70e04bca2cf832db4447b949b007c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 04:08:09 +00:00
Treehugger Robot
3665d8dfa8 Merge "Remove device.mk" 2023-04-08 03:30:16 +00:00
Wei Li
3bcd0bca6f Check if an installed file exists and report error if not.
So far there is only one case happened in b/277039235 that an installed file in that product is moved to another directory in LOCAL_POST_INSTALL_CMD. The team agreed to convert to Android.bp, but better to add a check and report the error.

Resend this to check symlinks using os.path.islink(), which doesn't follow the link. os.path.isfile() follows symlinks and returns false since the symlinks are for devices and could not be resolved on host file systems.

Bug: 277039235
Test: m sbom
Test: build/soong/tests/sbom_test.sh
Change-Id: Ia9f1cd24dc974a3e41487bc17c9c76a26d419395
2023-04-07 16:36:30 -07:00
Cole Faust
5752005ee4 Remove device.mk
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
2023-04-07 16:03:58 -07:00
Wei Li
a4c29b4ecc Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 am: 3b488ddaac
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I5f4574afa7e9899a75834975c47e9fba644dceca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 22:37:55 +00:00
Treehugger Robot
579e5d2dcd Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 am: a1c42f5b17
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: I56d60c850c851f47905d5c23a5543b3e67b29008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 22:37:28 +00:00
Wei Li
3b488ddaac Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I43b48c58deda34e371f9572504a2540db75ed671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:52:00 +00:00
Wei Li
0bb86d0515 Merge "Revert "Check if an installed file exists and report error if not."" 2023-04-07 21:40:09 +00:00
Treehugger Robot
a1c42f5b17 Merge "Add comments explaining how secondary OTA works" am: d8e23f9519
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: Ib43745870dbb47aa9d8d79aacac7ead9937739a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:37:05 +00:00
Wei Li
fd559f89b5 Revert "Check if an installed file exists and report error if not."
This reverts commit f049389e2e.

Reason for revert: the check includes more files that should not be excluded.

Change-Id: I7f7d260218826cc8fd033400b2cfaf40e4c280d0
2023-04-07 21:35:13 +00:00
Treehugger Robot
d8e23f9519 Merge "Add comments explaining how secondary OTA works" 2023-04-07 20:57:36 +00:00
Treehugger Robot
0ce108c06e Merge "Check if an installed file exists and report error if not." am: bd5a6e882d am: 1b3b6ff8b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: I287adc2e6ac3642368e46d09fc0468819d599783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 18:37:05 +00:00
Treehugger Robot
1b3b6ff8b2 Merge "Check if an installed file exists and report error if not." am: bd5a6e882d
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: I3d81aad580af9cec10ca61ae9e9baeb6f68103ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 18:07:03 +00:00
Treehugger Robot
bd5a6e882d Merge "Check if an installed file exists and report error if not." 2023-04-07 17:39:09 +00:00
Kelvin Zhang
bd111ccae2 Add comments explaining how secondary OTA works
Test: th
Change-Id: I72f890e3dcb6f8369dea8071da040b4c27877a2b
2023-04-07 09:47:04 -07:00
Wei Li
f049389e2e Check if an installed file exists and report error if not.
So far there is only one case happened in b/277039235 that an installed file in that product is moved to another directory in LOCAL_POST_INSTALL_CMD. The team agreed to convert to Android.bp, but better to add a check and report the error.

Bug: 277039235
Test: m sbom
Test: build/soong/tests/sbom_test.sh
Change-Id: I9a2302ced6dd605e60e54c49a8778426444dcc4f
2023-04-07 07:33:11 +00:00
Treehugger Robot
fbf81f8b10 Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: Ifd196ee3ed21cf117a94ece9c9c80c1cf04793f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 03:57:15 +00:00
Treehugger Robot
d7de9d7a9d Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: I3f753b33271b8c67cfc6e91276d731ba849c6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 03:30:03 +00:00
Treehugger Robot
4ae1b2e2b1 Merge "Add partition compatibility symlinks to installed file list." 2023-04-07 02:45:45 +00:00
Inseob Kim
e7d0b7a394 Merge "Remove 28.0 compat support" am: 3875d6c82f am: c32b330031
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I52d6ede32f3716bae22e2798ad29ce25a7702f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 02:00:23 +00:00
Inseob Kim
c32b330031 Merge "Remove 28.0 compat support" am: 3875d6c82f
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I4b49e53280c58f2e71fd9479b9479cac3ffbe753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 01:18:49 +00:00
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
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
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