commit c6d30d3b9b303d966c3a1c0430fa9c76cae25a08
author Kiyoung Kim <kiyoungkim@google.com> Thu Sep 21 05:03:58 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 21 05:03:58 2023 +0000
tree 1c8f8b647e41857073a09cb317b8d2bc125a6879
parent ad30396b0ec36f2a1a8712a200a4b01d8e261f9d
parent 5959c0200ddf1a69c57a8f30bebbe7f13406c849

Merge "Move vendor module into base_vendor" into main

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c74d0a3..f8dbafd 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -22,7 +22,6 @@
     android.hidl.base-V1.0-java \
     android.hidl.manager-V1.0-java \
     android.hidl.memory@1.0-impl \
-    android.hidl.memory@1.0-impl.vendor \
     android.system.suspend-service \
     android.test.base \
     android.test.mock \

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index d22f71f..b6e5370 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -46,6 +46,7 @@
 
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \
+    android.hidl.memory@1.0-impl.vendor \
     com.android.hardware.cas \
     boringssl_self_test_vendor \
     dumpsys_vendor \