display: Modifies Display Variants for QMAA Support

Change-Id: I71736ac1d28ebe53269435b85581c27ea1fe416a
AOSPA · Jul 14, 2021 · 01515ef · 01515ef
1 parent bc06c56
commit 01515ef
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/Android.bp b/Android.bp
@@ -116,6 +116,10 @@ qtidisplay_cc_defaults {
         },
         headless: {
             header_libs: ["display_headers"],
+            enabled: false,
+            conditions_default: {
+                enabled: true,
+            },
         },
     },
 }

diff --git a/gpu_tonemapper/Android.bp b/gpu_tonemapper/Android.bp
@@ -1,5 +1,6 @@
 cc_library_shared {
     name: "libgpu_tonemapper",
+    defaults: ["qtidisplay_defaults"],
     sanitize: {
         integer_overflow: true,
     },

diff --git a/gralloc/Android.bp b/gralloc/Android.bp
@@ -1,7 +1,7 @@
 //libgrallocutils
 cc_library_shared {
     name: "libgrallocutils",
-    defaults: ["qtidisplay_defaults"],
+    defaults: ["qtidisplay_common_defaults"],
     vendor: true,
     sanitize: {
         integer_overflow: true,
@@ -39,7 +39,7 @@ cc_library_shared {
 //libgralloccore
 cc_library_shared {
     name: "libgralloccore",
-    defaults: ["qtidisplay_defaults"],
+    defaults: ["qtidisplay_common_defaults"],
     sanitize: {
         integer_overflow: true,
     },
@@ -87,7 +87,7 @@ cc_library_shared {
 //mapper4
 cc_library_shared {
     name: "[email protected]",
-    defaults: ["qtidisplay_defaults"],
+    defaults: ["qtidisplay_common_defaults"],
     sanitize: {
         integer_overflow: true,
     },
@@ -128,7 +128,7 @@ cc_library_shared {
 //allocator
 cc_binary {
     name: "vendor.qti.hardware.display.allocator-service",
-    defaults: ["qtidisplay_defaults"],
+    defaults: ["qtidisplay_common_defaults"],
     sanitize: {
         integer_overflow: true,
     },

diff --git a/hdmi_cec/Android.bp b/hdmi_cec/Android.bp
@@ -2,6 +2,7 @@
 cc_library_shared {
 
     name: "hdmi_cec.qcom",
+    defaults: ["qtidisplay_defaults"],
     sanitize: {
         integer_overflow: true,
     },

diff --git a/libdebug/Android.bp b/libdebug/Android.bp
@@ -1,7 +1,7 @@
 cc_library_shared {
 
     name: "libdisplaydebug",
-    defaults: ["qtidisplay_defaults"],
+    defaults: ["qtidisplay_common_defaults"],
     sanitize: {
         integer_overflow: true,
     },

diff --git a/libdrmutils/Android.bp b/libdrmutils/Android.bp
@@ -1,6 +1,7 @@
 cc_library_shared {
 
     name: "libdrmutils",
+    defaults: ["qtidisplay_defaults"],
     sanitize: {
         integer_overflow: true,
     },

diff --git a/oem_services/Android.bp b/oem_services/Android.bp
@@ -4,6 +4,7 @@
 cc_library_shared {
 
     name: "libfilefinder",
+    defaults: ["qtidisplay_defaults"],
     sanitize: {
         integer_overflow: true,
     },
@@ -39,6 +40,7 @@ cc_library_shared {
 cc_binary {
 
     name: "[email protected]",
+    defaults: ["qtidisplay_defaults"],
     sanitize: {
         integer_overflow: true,
     },