Merge "Remove ashmemd and related artifacts"
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index ccd2309..4e33d23 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -33,7 +33,6 @@
     appops \
     app_process \
     appwidget \
-    ashmemd \
     atrace \
     audioserver \
     BackupRestoreConfirmation \
@@ -120,7 +119,6 @@
     libandroid_runtime \
     libandroid_servers \
     libartpalette-system \
-    libashmemd_client \
     libaudioeffect_jni \
     libbinder \
     libbinder_ndk \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 1e1effb..0b9b9db 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -51,7 +51,6 @@
     group_system_ext \
     group_vendor \
     init_vendor \
-    libashmemd_hidl_client \
     libbundlewrapper \
     libclearkeycasplugin \
     libdownmix \
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 5a50793..7683389 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -197,7 +197,6 @@
 VNDK-core: android.hidl.memory.block@1.0.so
 VNDK-core: android.hidl.token@1.0.so
 VNDK-core: android.hidl.token@1.0-utils.so
-VNDK-core: android.system.ashmem@1.0.so
 VNDK-core: android.system.net.netd@1.0.so
 VNDK-core: android.system.net.netd@1.1.so
 VNDK-core: android.system.suspend@1.0.so