display: Convert to vendor modules
Change-Id: I55e6f1eb3292431c3758f151f246d9a88b14199a
diff --git a/config/display-product-commonsys.mk b/config/display-product-commonsys.mk
deleted file mode 100644
index 98b22c3..0000000
--- a/config/display-product-commonsys.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-PRODUCT_PACKAGES += libdisplayconfig.system \
- libqdMetaData.system \
- libgralloc.system.qti \
- libdrm \
- libsmomo.qti \
- liblayerext.qti \
- libsmomoconfig.qti \
- libcomposerextn.qti \
- libdisplayconfig.system.qti
-
-SOONG_CONFIG_NAMESPACES += qtidisplaycommonsys
-SOONG_CONFIG_NAMESPACES += qtiunifeddraw
-# Soong Keys
-SOONG_CONFIG_qtidisplaycommonsys := displayconfig_enabled
-SOONG_CONFIG_qtiunifeddraw := qtiunifeddraw_enabled
-# Soong Values
-SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := false
-SOONG_CONFIG_qtiunifeddraw_qtiunifeddraw_enabled := true
-
-ifeq ($(call is-vendor-board-platform,QCOM),true)
- SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := true
-endif
diff --git a/config/display-product-vendor.mk b/config/display-product-vendor.mk
new file mode 100644
index 0000000..81fb1fb
--- /dev/null
+++ b/config/display-product-vendor.mk
@@ -0,0 +1,3 @@
+PRODUCT_PACKAGES += libqdMetaData \
+ libgralloc.qti \
+ libdisplayconfig.qti
diff --git a/gralloc/Android.bp b/gralloc/Android.bp
index 2c28cf6..9822728 100644
--- a/gralloc/Android.bp
+++ b/gralloc/Android.bp
@@ -1,6 +1,6 @@
cc_library_shared {
- name: "libgralloc.system.qti",
- system_ext_specific: true,
+ name: "libgralloc.qti",
+ vendor_available: true,
cflags: [
"-Wno-sign-conversion",
"-DLOG_TAG=\"qtigralloc\"",
diff --git a/libqdmetadata/Android.bp b/libqdmetadata/Android.bp
index 181eb16..c3d5fcb 100644
--- a/libqdmetadata/Android.bp
+++ b/libqdmetadata/Android.bp
@@ -1,6 +1,6 @@
cc_library_shared {
- name: "libqdMetaData.system",
- system_ext_specific: true,
+ name: "libqdMetaData",
+ vendor_available: true,
cflags: [
"-Wno-sign-conversion",
"-DLOG_TAG=\"qdmetadata\"",
@@ -11,7 +11,7 @@
"libcutils",
"libutils",
"libhidlbase",
- "libgralloc.system.qti",
+ "libgralloc.qti",
"libgralloctypes",
],
header_libs: ["libhardware_headers", "display_intf_headers"],
diff --git a/services/config/src/Android.bp b/services/config/src/Android.bp
index 307f773..1951465 100644
--- a/services/config/src/Android.bp
+++ b/services/config/src/Android.bp
@@ -1,6 +1,6 @@
cc_library_shared {
- name: "libdisplayconfig.system.qti",
- system_ext_specific: true,
+ name: "libdisplayconfig.qti",
+ vendor_available: true,
cflags: [
"-Wno-sign-conversion",
"-Wno-unused-parameter",