Treehugger Robot
52fdcf5457
Merge "Allow setting future api level before REL"
2023-04-11 00:09:23 +00:00
Roman Kiryanov
b01d27312a
Add the system_dlkm partition to goldfish
...
required by GKI
Bug: 277230251
Test: atest -c vts_dlkm_partition_test
Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Merged-In: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-04-10 16:30:32 -07:00
Roman Kiryanov
d855a7116a
[automerger skipped] Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS am: d7637446be
-s ours am: 3d0eaa9fa1
-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: I78cc4d38051f6bc6bfc749adf454420a4eab60a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 21:20:24 +00:00
Roman Kiryanov
766fccbc1f
[automerger skipped] Retire QEMU_USE_SYSTEM_EXT_PARTITIONS am: b790c9f1db
-s ours am: 721bee4bbf
-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: Ic5db64874e91efcfd11b58b1e0c98b5ce8f2462a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 21:20:16 +00:00
Roman Kiryanov
931ead1ee5
[automerger skipped] Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64 am: 9e8e6a7329
-s ours am: b97a105522
-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: I12fd615b6b6210223a2885e4337f8d7b15228683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 21:20:07 +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
d3384fd665
Merge "Check if an installed file exists and report error if not." am: 0bbde41728
am: 9d38ce9784
am: 7c93b50eca
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028
Change-Id: I76befd44c7d9b0f9894019c7b08abc6edc06f0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 19:49:29 +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
Roman Kiryanov
52b797e741
Remove emulator dependencies on non emulator targets (1)
...
Bug: 266607613
Bug: 111538404
Test: presubmit
Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-04-10 10:53:25 -07:00
Treehugger Robot
0bbde41728
Merge "Check if an installed file exists and report error if not."
2023-04-10 17:49:32 +00:00
Jooyung Han
5b11f313cd
Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7
am: ac31a9eee0
am: ac1368846a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495
Change-Id: I315975e654f43fe0632ca97039c7d69d4c448803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-10 09:33:14 +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
Alex Buynytskyy
e7dc4736dc
UpsideDownCake is now 34
...
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
2023-04-09 15:13:20 +00:00
Treehugger Robot
347607b177
Merge "Remove device.mk" am: 3665d8dfa8
am: 85d032fb46
am: b01b05bf69
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027
Change-Id: I69642a3d1ae9886ce256ce9b8530c62970fb16ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-08 05:08:07 +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
Wei Li
8b6849f55d
Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515
am: 3b488ddaac
am: a4c29b4ecc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026
Change-Id: I6743ab4b12302ee62fe3c57225c947e277d31adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 23:08:22 +00:00
Treehugger Robot
4f2cb2a3fd
Merge "Add comments explaining how secondary OTA works" am: d8e23f9519
am: a1c42f5b17
am: 579e5d2dcd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438
Change-Id: I24e6a828ae8dd44cd39229fd86e917a8bc8e70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 23:07:21 +00: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
f66ded0141
Merge "Check if an installed file exists and report error if not." am: bd5a6e882d
am: 1b3b6ff8b2
am: 0ce108c06e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433
Change-Id: Ibdb87f346766f2d24d0cf4ccd6da55cbd646c53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 19:11:23 +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
fd24e2486b
Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1
am: d7de9d7a9d
am: fbf81f8b10
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021
Change-Id: I63f934320589cf6b81d7cc3b4044181de107f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 04:24:45 +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
30d4860a38
Merge "Remove 28.0 compat support" am: 3875d6c82f
am: c32b330031
am: e7d0b7a394
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775
Change-Id: I00f2661a69e93a96e27c58c595e9330ca4958950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 02:28:34 +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
Alex Buynytskyy
33707ef488
Merge "Minor renaming and documentation." am: 0fce469f2d
am: fc5ca8ba20
am: 7807b77323
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606
Change-Id: I0433b874d7d5a522032f0984e323b54d688fc3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 01:04:20 +00:00