Commit graph

8840 commits

Author SHA1 Message Date
Jihoon Kang
1ddc046b62 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036 am: 462f1cba6b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: Iee9fe45de38bba4dde3dd054584ff844545d8ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 21:24:10 +00:00
Jihoon Kang
452241468c Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:20:33 +00:00
Jihoon Kang
596d514744 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main 2023-09-26 17:49:25 +00:00
Treehugger Robot
4c88a966ba Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d am: 38112357ab am: 61bf849e1d am: 7e88607173
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I29ca1a47680e7019d5cb7fb9332f0b3cbe9089f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 02:06:07 +00:00
Treehugger Robot
38112357ab Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I291da664bbca6a0e6661a2befbf0dc90e24592c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 23:32:03 +00:00
Treehugger Robot
50b8e4fb0d Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main 2023-09-22 23:07:26 +00:00
Mark White
ca047da45c Added new framework-pdf jar inside MediaProvider module
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Id9f5ae58d57c77fdaf4babee58430e75656e923f
2023-09-22 13:33:05 +00:00
Kiyoung Kim
8908792eba Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: I606465eb0605677407e6394276dbc4656e12860b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 05:20:46 +00:00
Kiyoung Kim
4345d8fd20 Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Id0236f9d3f936532f9cf6d71f2630b85cd0450e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:49:35 +00:00
Kiyoung Kim
a8c405f264 Merge "Define llndk modules instead of vndk_package" into main 2023-09-22 02:15:35 +00:00
Tomislav Novak
1af7e1fa7f emulator_arm64: Revert TARGET_NO_KERNEL to emulator default
With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on
$PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup
in emulator_arm64/device.mk").

$ lunch sdk_phone_arm64-eng && m
[...]
FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by
  'out/target/product/emulator_arm64/boot.img', missing and no known
  rule to make it

Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that
the emulator then uses, so no need to generate the boot image.

Test: lunch sdk_phone_arm64-eng && m
Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5
2023-09-21 14:49:56 -07:00
Kiyoung Kim
347265e876 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b am: b51cfc63a5 am: 5d57118010 am: bb1df6b155
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8f5cc5f15bf2f2eac2e07d2992e4d104457ebf06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 08:40:00 +00:00
Kiyoung Kim
81923d1289 Define llndk modules instead of vndk_package
vndk_package installs more than VNDK APEX, which includes LLNDK for
system and some core modules with vendor variant. This change adds a new
target llndk_in_system to instal LLNDK modules in the system image and
use this package if VNDK is deprecated

Bug: 299197187
Test: Cuttlefish and Cheetah boot succeeded without error
Change-Id: I9fe1114fdcb65c6143b5f734425c878a29138d0b
2023-09-21 15:43:55 +09:00
Kiyoung Kim
b51cfc63a5 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8b90699fe82c582e94c2533eb0438d2b9e4f990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 06:07:10 +00:00
Kiyoung Kim
c6d30d3b9b Merge "Move vendor module into base_vendor" into main 2023-09-21 05:03:58 +00:00
Kiyoung Kim
5959c0200d Move vendor module into base_vendor
There is a vendor module android.hidl.memory@1.0-impl.vendor which is
defined in the base_system. Based on the definition of base_system.mk
and base_vendor.mk, this module is better to be located in the
base_vendor.mk. This change moves the module from base_system into
base_vendor.

Bug: 301344301
Test: Cuttlefish build succeeded
Change-Id: I6dba5ec2380028b1b2c629f901db996c518e3f72
2023-09-21 10:32:50 +09:00
Jihoon Kang
e06e4c5037 Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API added to the sdk targets will be used to determine whether to exclude flagged apis for next release or not.

Test: m TARGET_PRODUCT=sdk nothing
Bug: 299570421
Change-Id: I00cb84341a05e296a0c747d4921ed5fe445eabe6
2023-09-20 19:53:04 +00:00
Treehugger Robot
222fc3701a Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I2fe77abebfc365fcfd847495fef3576e4824a284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 09:28:02 +00:00
Treehugger Robot
a5a1d2afb4 Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: Ida61c3b1eba3ab16031f2649c15ab7a4ea83193a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 07:41:53 +00:00
Treehugger Robot
948d449316 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: Ibe1dda6123ec55240fbf8dc525a6a1ca89f528cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 06:56:43 +00:00
Justin Yun
d34a22ce39 Restore the VNDK list for v34 which was frozen
VNDK v34 was already frozen and must not be changed. Restore the
original version of the VNDK list.

Ignore-AOSP-First: This is not released in AOSP yet
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I0edb24568f28caf8b08cfa5c1b6dba44d3c91a9e
2023-09-20 04:48:53 +00:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
2023-09-19 23:06:39 +00:00
Jooyung Han
fe02b7ce20 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I0252b9a7b2e8d7658da0228f5280e53bafaa4922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 03:27:52 +00:00
Jooyung Han
7d06ca9d8d Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I9e300e2b69b22a343a530ef66274db21ebe41f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:57:03 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Sebastian Pickl
936d843df8 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Id1fddcf22cfd71efb288b34516086d356855ee16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 15:02:07 +00:00
Sebastian Pickl
96d2c61fda Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Ib53fc2b438e8f2710ac18fae946cf2336ab8bb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 13:32:24 +00:00
Jooyung Han
72187661c3 Revert^2 "Install CAS HAL APEX"
5d6da97ed0

Change-Id: Ic621583ff1ee1c3eefb6caeff77d950f2e08e1e1
2023-09-14 13:31:55 +00:00
Sebastian Pickl
f4ce61774a Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I0d3225691bfe3fe1f471ba49ad5e0fdc21ef6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 12:37:00 +00:00
Sebastian Pickl
91646be0a5 Merge "Revert "Install CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
5d6da97ed0 Revert "Install CAS HAL APEX"
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Change-Id: I2b566413ac1869f9bf3e974da7d84662047e436a
2023-09-14 12:25:49 +00:00
Treehugger Robot
892120d1c2 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I0aa1361dcd0142d115ce0596e4408539acd3dbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 03:07:01 +00:00
Treehugger Robot
bc18f8c151 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I438e0f14237eaa82794d3c47aa534b17b0164e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 01:37:03 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 00:43:18 +00:00
Treehugger Robot
1e042d4635 Merge "Do not freeze VNDK in trunk stable" into main 2023-09-14 00:16:18 +00:00
Justin Yun
e9525900e5 Do not freeze VNDK in trunk stable
VNDK will be frozen only if the VNDK version is less than or equal to
34. Otherwize do not freeze the VNDK libraries.

Bug: 297542516
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: Icdd288f65c5f7bdb5b4899c8e96820c2a147a011
2023-09-13 13:07:34 +09:00
Jooyung Han
15731d0704 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I87bc320565fa4c52bc5183d9218854b85a4e4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:51:46 +00:00
Jooyung Han
e053f9f34f Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I8bba3c57662f2de619da9418e8296d615614c59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:24:51 +00:00
Jooyung Han
1565036d44 Merge "Install CAS HAL APEX" into main am: be6ba681e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: Id2497994e483a95339bdf6d04ea939d5981e6b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:20:22 +00:00
Jooyung Han
62df04d78f Install CAS HAL APEX
Bug: 297467514
Test: CtsMediaMiscTestCases#MediaCasTest
Change-Id: I4fc9496381a92c26e1b1a4aebfee947770c7ad5c
2023-09-06 16:20:06 +09:00
Cole Faust
a4b5a72af6 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I85dff2e7a0adafc771c2614d3ceff3cc83f91ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 03:13:19 +00:00
Cole Faust
79b49a32ba Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Icb542999a02db66ea698b95158ec0f2231141013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:50:24 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
2023-09-05 14:16:38 -07:00
Treehugger Robot
06da7cbec1 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I05ba68038ad19a0f01be3516f986b1551ab1eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 02:00:47 +00:00
Treehugger Robot
436a85aff7 Merge "Add vndk list change history file" into udc-dev-plus-aosp 2023-09-04 00:44:29 +00:00
Treehugger Robot
b09a85e7c8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I0d6638a59b276b18edc3aa3da7f487a8f01d8e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 02:23:14 +00:00
Treehugger Robot
df13dc9be8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Id2c4cd9e5d06daae60a4988403deeede6002badc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 00:54:42 +00:00
Treehugger Robot
d56c052f72 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ib34308cf87d0c2c26055379ab117668fc6bf4f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 00:01:04 +00:00
Treehugger Robot
5da26c0ab3 Merge "Add the adevice host tool to standard builds" into main 2023-09-01 23:13:14 +00:00
Joe Onorato
08d6ebf118 Add the adevice host tool to standard builds
Test: treehugger
Change-Id: Ib8caceecbcc355f6aa8725a2f134f2d1ac86d387
2023-09-01 13:24:51 -07:00
Justin Yun
d8e310348b Add vndk list change history file
Some devices may have the vndk files before that are removed after
the version fix. To track those devices, leave history of the list
change.

Ignore-AOSP-First: udc not yet released
Bug: 298120088
Test: atest vts_vndk_files_test
Change-Id: I0b532e706d3b7214be7d67e7b34e0ccf993759b7
2023-09-01 09:13:01 +00:00
Devin Moore
67ef54058d Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 am: 516f2d9cb8 am: 570d5e6a98
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I38e41eb2aad7db9813b24308f11a3ea4cec9c09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 17:49:57 +00:00
Devin Moore
516f2d9cb8 Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I2a62fa5d2bc5286c5022d062f5bedf6ffdece410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 16:25:08 +00:00
Devin Moore
278aea5ba4 Remove hwservicemanager and hidl allocator. am: 64c2559577
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0 Merge changes from topic "no_hidl_support" into main
* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
2023-08-31 15:51:14 +00:00
Treehugger Robot
f3e72aa8df Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: Iabefdf31d498bd577b8610fdc4f9442d2d68044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 04:53:57 +00:00
Justin Yun
dc6e1496fc Update vndk list 34.txt
Bug: 297542516
Test: lunch cf_x86_64_phone-next-userdebug && m
Change-Id: I7984e0f1d311ed4a9f908f0232f2bc1994a90157
2023-08-29 10:54:00 +09:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Jooyung Han
bf2fb0676e Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I23d643b8197c34172b84cdc646d5c2bf7510c397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 03:02:40 +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
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -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
Chris Poultney
5541d13e89 Adds modern wallpaper pickers to AOSP installs
Bug: b/294871815
Change-Id: I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
Ignore-AOSP-First: Change only applies to udc-qpr-dev and forward and will cause breakages in tm-dev and udc-dev.
2023-08-24 15:19:31 +00:00
Vincent Donnefort
01def4629e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d am: f1f3c8ab80
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Ieee0b6ea843667c9425df2557281b2e5c598c036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 10:47:48 +00:00
Vincent Donnefort
ad81fc0d1d Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: I3fa9a706433a3c93d1305977b5bb7bb9fc2cd73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 09:37:34 +00:00
Vincent Donnefort
07c4b5c0f2 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main 2023-08-24 08:11:04 +00:00
Woody Lin
371905638a Revert "Adds modern wallpaper pickers to AOSP installs"
This reverts commit af76a98608.

Reason for revert: To fix regression test failure on 'WallpaperPickerGoogleTests'
Bug: 297301079

Change-Id: Id9eb21db31182c68551ef9e3c3d4d258879c541b
2023-08-24 05:41:52 +00:00
Chris Poultney
51611e7654 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e am: 4d7d1a22c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Iaf7217af984606953a8b5348962ed0e42ed004c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:53:02 +00:00
Chris Poultney
57a48aaa8e Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Id998ce6660a492f51a1cbfe1c679cb15d424e8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 03:45:46 +00:00
Chris Poultney
214c0e27e1 Merge "Adds modern wallpaper pickers to AOSP installs" into main 2023-08-24 02:21:24 +00:00
Kangping Dong
bd7e6f5d93 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72 am: 114fc180a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I77b79395860cb850e56ef6829f782c76636b4c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:49:33 +00:00
Kangping Dong
34aa3b1946 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Id1387ebe609ed7d8c32610f7ce87dc26c5240c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:49:29 +00:00
Kangping Dong
21989e8b72 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I061353705b5ae7b3948c73bee11ec8dd229b4712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:44:32 +00:00
Kangping Dong
fcafc708a0 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I1122148b13710be4c9bd90ba253d7ddf1834b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:44:27 +00:00
Kangping Dong
a169e4f7f6 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Treehugger Robot
d312aaf9c5 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af am: 7beaebe190
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I2de90c1e9465f6873b06bd7464a3f161f2643b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 07:42:09 +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
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Chris Poultney
af76a98608 Adds modern wallpaper pickers to AOSP installs
Bug: b/294871815
Change-Id: Id4c198f79a32b1b5a6a1a594cbb88f8df1623fe7
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
2023-08-23 02:53:00 +00:00
Ronald Braunstein
a7184c68f2 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 am: 48ba4aced4 am: add40e14c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: Ic18d531f956e444397f68c7098a968f5ed45df9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 02:05:30 +00:00
Ronald Braunstein
48ba4aced4 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: I1b29d8968570cf2735e96c9a16b98b3731e628a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 00:59:10 +00:00
Ronald Braunstein
d7eeaba58f Merge "Add adevice_fingerprint to eng builds." into main 2023-08-22 23:58:50 +00:00
Ronald Braunstein
c747c3419f Add adevice_fingerprint to eng builds.
We are working on a replacement for "adb sync" and it requires something
running on the device to send back a fingerprint of the filesystem.
This binary is intendend to be part of developers going forward so we
are adding it in all eng/userdebug builds.
The binary is 830k bytes.

Test: m install-clean ; m ; acloud create --local-image ; adb shell ls -l /system/bin/adevice_fingerprint

Change-Id: I98359cc37cffeffc7ffbfd61d6bc9a51ba318a99
2023-08-22 16:02:04 -07: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
Chun-Yi Lee
6f883e4d11 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af am: 6d0f94b1f0 am: 43c81c6fda
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: Iaae51475fedf0c0418d0dd50a04647a37261f860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 04:35:55 +00:00
Chun-Yi Lee
6d0f94b1f0 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I2f8859ece12585bddcbbc302483097d95e4c21ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 03:33:12 +00:00
Chun-Yi Lee
6f09d105ef Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main 2023-08-22 02:11:23 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements"
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
2023-08-22 01:18:51 +00:00
Cole Faust
b038d13fba Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: Ic67f09632801bcced88587f63e520a75218c493a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:51:51 +00:00
Cole Faust
b023d21043 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I042a54db2f74c465f6b3c82a384fa1719519dda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:21 +00:00
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +00:00
Cole Faust
f7554e3735 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: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07:00
Kangping Dong
1fb1dd701c Revert "add com.android.threadnetwork to base_system.mk"
This reverts commit 286e55ad94.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: Id601ab8b6f160d8fc2b7a9720652842cc2c194ba
2023-08-22 00:51:40 +08:00
Alex Buynytskyy
5f1a89be6e Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca am: cbc1f8abe3
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I330c2423d3f130ab00e47e095a6ec6f33c4603cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 19:35:14 +00:00
Alex Buynytskyy
bcb65cbfca Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I87bf7f14bd5a543f091445c70c54af16ad1db494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 18:41:04 +00:00
Alex Buynytskyy
4a35600b7f Merge "Ignore invalid vndk snapshot versions" into main 2023-08-18 17:51:23 +00:00