Revert "Rename module name due to duplicate"

This reverts commit f19bfaa2032da02b3d1c1e03c01527f1084f022e.

Bug: 112062468
Change-Id: I7479479f11aee8697ce5deb1d698fd5c7ff7f8de

11 files changed, 27 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index ca5efef7..1eae1b0c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,12 +12,12 @@ cc_defaults {
         "libcutils",
         "libutils",
     ],
-    header_libs: ["display_headers_sdm710"],
+    header_libs: ["display_headers"],
     clang: true,
 }
 
 cc_library_headers {
-    name: "display_headers_sdm710",
+    name: "display_headers",
     vendor_available: true,
     export_include_dirs: [
         "include",
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index dc5aa20d..f2184aa5 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -9,8 +9,8 @@ LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
 
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
-LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData_sdm710 libsync libgrallocutils \
+LOCAL_HEADER_LIBRARIES        := display_headers
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData libsync libgrallocutils \
                                  libgralloccore \
                                  android.hardware.graphics.mapper@2.0 \
                                  android.hardware.graphics.mapper@2.1
@@ -28,8 +28,8 @@ LOCAL_MODULE                  := libgrallocutils
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
-LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData_sdm710 libdl  \
+LOCAL_HEADER_LIBRARIES        := display_headers
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData libdl  \
                                   android.hardware.graphics.mapper@2.0 \
                                   android.hardware.graphics.mapper@2.1
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
@@ -43,8 +43,8 @@ LOCAL_MODULE                  := libgralloccore
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
-LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData_sdm710 libdl libgrallocutils \
+LOCAL_HEADER_LIBRARIES        := display_headers
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdMetaData libdl libgrallocutils \
                                   android.hardware.graphics.mapper@2.1
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
@@ -68,11 +68,11 @@ LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := $(common_libs) \
                                   libhidlbase \
                                   libhidltransport \
-                                  libqdMetaData_sdm710 \
+                                  libqdMetaData \
                                   libgrallocutils \
                                   libgralloccore \
                                   libsync \
@@ -88,11 +88,11 @@ LOCAL_MODULE                  := vendor.qti.hardware.display.allocator@1.0-servi
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := $(common_libs) \
                                  libhidlbase \
                                  libhidltransport\
-                                 libqdMetaData_sdm710 \
+                                 libqdMetaData \
                                  libgrallocutils \
                                  libgralloccore \
                                  android.hardware.graphics.mapper@2.1 \
diff --git a/hdmi_cec/Android.mk b/hdmi_cec/Android.mk
index 3a8f7490..a333654c 100644
--- a/hdmi_cec/Android.mk
+++ b/hdmi_cec/Android.mk
@@ -7,8 +7,8 @@ LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
-LOCAL_SHARED_LIBRARIES        := $(common_libs) libqservice_sdm710 libbinder libqdutils_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libqservice libbinder libqdutils
 
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdhdmi_cec\" -Wno-sign-conversion
 LOCAL_CLANG                   := true
diff --git a/include/Android.mk b/include/Android.mk
index ce2182af..58653c16 100644
--- a/include/Android.mk
+++ b/include/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 # Legacy header copy. This is deprecated.
 # Modules using these headers should shift to using
-# LOCAL_HEADER_LIBRARIES := display_headers_sdm710
+# LOCAL_HEADER_LIBRARIES := display_headers
 LOCAL_VENDOR_MODULE           := true
 LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
 LOCAL_COPY_HEADERS            := color_metadata.h \
diff --git a/libdisplayconfig/Android.mk b/libdisplayconfig/Android.mk
index 54d5c1b3..ec9340d2 100644
--- a/libdisplayconfig/Android.mk
+++ b/libdisplayconfig/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE                  := libdisplayconfig
 LOCAL_MODULE_TAGS             := optional
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SRC_FILES               := DisplayConfig.cpp
 LOCAL_SHARED_LIBRARIES        := libhidlbase libhidltransport libutils \
                                  vendor.display.config@1.0
diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk
index 58222e2f..97c052b1 100644
--- a/libdrmutils/Android.mk
+++ b/libdrmutils/Android.mk
@@ -6,7 +6,7 @@ LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := external/libdrm \
                                  $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := libdrm libdl libdisplaydebug
 LOCAL_CFLAGS                  := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names
 LOCAL_CLANG                   := true
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp
index b61de4ab..0c1b96a1 100644
--- a/libqdutils/Android.bp
+++ b/libqdutils/Android.bp
@@ -1,11 +1,11 @@
 cc_library_shared {
-    name: "libqdutils_sdm710",
+    name: "libqdutils",
     vendor: true,
     defaults: ["display_defaults"],
     header_libs: ["libhardware_headers", "libutils_headers"],
     shared_libs: [
         "libbinder",
-        "libqservice_sdm710",
+        "libqservice",
     ],
     cflags: [
         "-DLOG_TAG=\"qdutils\"",
@@ -18,7 +18,7 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "libqdMetaData_sdm710",
+    name: "libqdMetaData",
     vendor: true,
     defaults: ["display_defaults"],
     cflags: [
@@ -30,7 +30,7 @@ cc_library_shared {
 
 // Remove after WFD moves to use libqdMetaData directly
 cc_library_shared {
-    name: "libqdMetaData.system_sdm710",
+    name: "libqdMetaData.system",
     defaults: ["display_defaults"],
     cflags: [
         "-Wno-sign-conversion",
diff --git a/libqservice/Android.bp b/libqservice/Android.bp
index 10f6770f..fe69d393 100644
--- a/libqservice/Android.bp
+++ b/libqservice/Android.bp
@@ -1,5 +1,5 @@
 cc_library_shared {
-    name: "libqservice_sdm710",
+    name: "libqservice",
     vendor: true,
     defaults: ["display_defaults"],
     shared_libs: ["libbinder"],
diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index 7efda86d..d4aa9331 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE                  := libsdmcore
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_CFLAGS                  := -fno-operator-names -Wno-unused-parameter -DLOG_TAG=\"SDM\" \
                                  $(common_flags)
 LOCAL_HW_INTF_PATH_1          := fb
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index d90a5eee..a671c31b 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -9,15 +9,15 @@ LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 
 LOCAL_CFLAGS                  := -Wno-missing-field-initializers -Wno-unused-parameter \
                                  -std=c++11 -fcolor-diagnostics\
                                  -DLOG_TAG=\"SDM\" $(common_flags)
 LOCAL_CLANG                   := true
 
-LOCAL_SHARED_LIBRARIES        := libsdmcore libqservice_sdm710 libbinder libhardware libhardware_legacy \
-                                 libutils libcutils libsync libqdutils_sdm710 libqdMetaData_sdm710 \
+LOCAL_SHARED_LIBRARIES        := libsdmcore libqservice libbinder libhardware libhardware_legacy \
+                                 libutils libcutils libsync libqdutils libqdMetaData \
                                  libsdmutils libc++ liblog libgrallocutils libui libgpu_tonemapper \
                                  libhidlbase libhidltransport vendor.display.config@1.0 \
                                  android.hardware.graphics.mapper@2.0 \
diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk
index a44ddcd4..a9d705cd 100644
--- a/sdm/libs/utils/Android.mk
+++ b/sdm/libs/utils/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE                  := libsdmutils
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes)
-LOCAL_HEADER_LIBRARIES        := display_headers_sdm710
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_CFLAGS                  := -DLOG_TAG=\"SDM\" $(common_flags)
 LOCAL_SRC_FILES               := debug.cpp \
                                  rect.cpp \