Commit graph

8917 commits

Author SHA1 Message Date
Alyssa Ketpreechasawat
0a86673d46 Revert "Added new framework-pdf jar inside MediaProvider module"
Revert submission 2759049-framework-pdf

Reason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)

Reverted changes: /q/submissionid:2759049-framework-pdf

Change-Id: I7765daebf6a85f0c8d737c0cf163b1fdbe29f969
2023-10-05 16:09:51 +00:00
Treehugger Robot
4ea9ca651f Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4 am: cbceed2231 am: dc67ccf62e am: a2874ee1e6 am: bdd2e4a34f
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I925a9f9549460e7254664662b5f9d2d161181716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:50:17 +00:00
Treehugger Robot
bdd2e4a34f Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4 am: cbceed2231 am: dc67ccf62e am: a2874ee1e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I6270cf530d39620523f8a8bb6327591c2bce4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:48 +00:00
Treehugger Robot
cbceed2231 Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I8949364d94b6263f06522992f6790c22a8ec6a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 13:00:33 +00:00
Justin Yun
4a39d20909 Install VNDK v35 in the vendor partition
This is required for the vendor image with VNDK v35 to be used for
the GRF configuration.
This does not modify the VNDK install path before release.

Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I689cb6dcf66cd4a23c447bd0d761677f78b0936a
2023-10-05 18:07:20 +09:00
Jan Sebechlebsky
47cd7202ec Add Virtual Camera HAL service to base_system.
... following instructions to add new binary using build flags.

Bug: 301023410
Test: mm
Ignore-AOSP-First: Virtual Camera HAL target is not merged in AOSP.
Change-Id: I83b6a33775c763671eb2ab11e5fca9b12676b1bc
2023-10-05 09:17:12 +02:00
sergiuferentz
e62001953f Bump android.hardware.graphics.common V4->V5
Test: Build
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects
Bug: 291142745
Change-Id: Iefb2ebc22f622d8e97f8a878f972d8b354aa1b7d
2023-10-04 13:21:28 +00:00
Ahmad Khalil
576421d844 Modifying base_system to use the new SoundPicker flag
Bug: 293846645
Change-Id: I4b9e0b3cd80f43f9e766d430d749238d10a9eb82
Test: N/A
2023-10-03 15:37:16 +00:00
Treehugger Robot
a0db5763a1 Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df am: e3c42a48ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I0ec15b206fbe1417ba4968e30ee0342c7cb70b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:53:57 +00:00
Treehugger Robot
e3c42a48ee Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I6ed60bf4467d02851efcd48e09c8dc5dcd062ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:24:08 +00:00
Treehugger Robot
b93e3b021e Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I306f5cc077588f0036726a3c5da9ce5acaeffacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:44:40 +00:00
Cole Faust
36e089a6cc Convert gsi_skip_mount.cfg to soong
The LOCAL_POST_INSTALL_CMD is problematic for m installclean-less
builds.

Bug: 205632228
Test: presubmits
Change-Id: Id4eb2fd5fbd4f080aec89fa90583ac2ec97c5e1c
2023-10-02 17:28:59 -07:00
Victor Hsieh
e8a9b9b943 Add preinstalled-packages-strict-signature.xml to build
Please refer to the topic change for context.

Ignore-AOSP-First: new file added in the internal branch
Bug: 277344944
Test: m
Change-Id: I09dd6b152c3a4b4e884132885d72f97e805797f8
2023-09-29 11:26:57 -07:00
Mark White
48153e18ce Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16 am: 0ced72aa62
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I9f1f58bbebfd22aec316599a0ee33732cbeef108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 17:39:37 +00:00
Mark White
0ced72aa62 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: Ic3c21b31de78ed719605a33ca048bce6e280827c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 16:23:17 +00:00
Mark White
23e70c67ad Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I6c7e02dbe20d457e5f63a2304665bca400879f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 13:26:48 +00:00
Mark White
d577d60221 Merge "Added new framework-pdf jar inside MediaProvider module" into main 2023-09-29 12:21:33 +00:00
Mårten Kongstad
739bbde46d Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c am: 6f3642b88f am: 50491ebbbe
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I52aeadd143a1c9be74a86fe1afbdbb2e497b19bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:44:13 +00:00
Mårten Kongstad
50491ebbbe Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c am: 6f3642b88f
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I08f9cc79a4b1dc4baa3a40de1eb3409bf8cac80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:39:02 +00:00
Mårten Kongstad
286ea9f8a8 Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I477c1da7dd79b0156819b748d1b2ac3a39dfe84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 14:22:07 +00:00
Mårten Kongstad
dd1ebe9300 Merge changes from topic "printflags-include-device-config" into main
* changes:
  printflags: add printflags to PRODUCT_PACKAGES
  printflags: include device_config values
2023-09-27 13:04:40 +00:00
Mårten Kongstad
583a52478b printflags: add printflags to PRODUCT_PACKAGES
Include the printflags device tool in the system image by default.

Bug: 301547297
Test: adb shell printflags
Change-Id: I3b2d71c89742bd389f6cafff8d8ab25fb81c7b00
2023-09-27 10:42:04 +02:00
Jihoon Kang
94b5d81de8 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036 am: 462f1cba6b am: 1ddc046b62
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I89fe0dfd688b72a9f5c9e9308285bcae9d026c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:31:21 +00:00
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
b6ece2d257 Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d am: 38112357ab am: 61bf849e1d am: 7e88607173 am: 4c88a966ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I1f35d3dbc9364eb80700870b18774f813981ca7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 03:14:41 +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
7d500d265d Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b am: 8908792eba
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Ib730bcf18091d2d57b465df5eb6beabfe47cdf01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 06:26:20 +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
7cd53a62f3 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b am: b51cfc63a5 am: 5d57118010 am: bb1df6b155 am: 347265e876
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I066a3873fcd9333067d9fa6437ade9b179f1a509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 09:44:08 +00: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
21ea477a99 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70 am: 222fc3701a
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I01f4b651f0255135d0d7fbca89468d65ff36ce3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 10:33:02 +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
9e40d6bf5f Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136 am: a5a1d2afb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: I68227ae92a93de6eaeb390d89b05ced1086c701a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 07:54:26 +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
9a561e793f Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7 am: fe02b7ce20
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I76169f3f3e668a67c940ef2df83b02bf451f2929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:31:43 +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
a175a28fb9 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4 am: 936d843df8
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I71b2d49d619e75c70207da12f589d9b3f831080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 16:03:27 +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
dd86a228eb Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672 am: 892120d1c2
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I3cefcbd4d4252422f85b6becd824839a8428e25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 04:11:39 +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
66392e0bd3 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844 am: 15731d0704
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I6758cb9c5f413997c4c4d10722a3fbb125c09942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:52:17 +00: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
Dennis Shen
fa7f6d4a64 Merge "update sever_configurable_flags to vndk true" into main 2023-09-06 12:00:42 +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
1b32c99148 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 am: a4b5a72af6
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I75b8e1667708066e8078c3d4eb3727b758ca87a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 04:11:12 +00: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
Dennis Shen
e74b12cd7b update sever_configurable_flags to vndk true
Bug: 297419706
Change-Id: I46a8d9e35d28ad9eb7e305465e537dcf23e523f4
Ignore-AOSP-First: need to submit to git main first to resolve merge conflict, will used merged in in aosp change
2023-09-05 19:41:55 +00:00
Treehugger Robot
ac1535d4a7 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd am: 06da7cbec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: Ifa2ac3a1bdad492e6a98bcf2e1a4fc160df36e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 03:02:04 +00: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
1e8145dd4c Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 am: b09a85e7c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I68650d0e241786e258476f8a73741cca9b011547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 03:26:51 +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
48854f1b8d Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 am: 516f2d9cb8 am: 570d5e6a98 am: 67ef54058d
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: Ieacf062b55976c179157d48575ea94d77b591ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 18:49:56 +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
0c74b18920 Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1 am: f3e72aa8df
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: I790ef71ab8c50123ae4fe87c731b17d77cae242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 23:15:27 +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