From f19bfaa2032da02b3d1c1e03c01527f1084f022e Mon Sep 17 00:00:00 2001 From: ChengYou Ho Date: Mon, 2 Jul 2018 11:40:39 +0800 Subject: Rename module name due to duplicate Bug: 111163725 Change-Id: I93513594c44531c9efb6a04170cc4da0f70a1f42 --- Android.bp | 4 ++-- gralloc/Android.mk | 20 ++++++++++---------- hdmi_cec/Android.mk | 4 ++-- include/Android.mk | 2 +- libdisplayconfig/Android.mk | 2 +- libdrmutils/Android.mk | 2 +- libqdutils/Android.bp | 8 ++++---- libqservice/Android.bp | 2 +- sdm/libs/core/Android.mk | 2 +- sdm/libs/hwc2/Android.mk | 4 ++-- sdm/libs/utils/Android.mk | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Android.bp b/Android.bp index 1eae1b0c..ca5efef7 100644 --- a/Android.bp +++ b/Android.bp @@ -12,12 +12,12 @@ cc_defaults { "libcutils", "libutils", ], - header_libs: ["display_headers"], + header_libs: ["display_headers_sdm710"], clang: true, } cc_library_headers { - name: "display_headers", + name: "display_headers_sdm710", vendor_available: true, export_include_dirs: [ "include", diff --git a/gralloc/Android.mk b/gralloc/Android.mk index b97b5df0..92f53107 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) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libsync libgrallocutils \ +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 +LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData_sdm710 libsync libgrallocutils \ libgralloccore \ android.hardware.graphics.mapper@2.0 \ android.hardware.graphics.mapper@2.1 @@ -29,8 +29,8 @@ LOCAL_MODULE := libgrallocutils LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libdl \ +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 +LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData_sdm710 libdl \ android.hardware.graphics.mapper@2.0 \ android.hardware.graphics.mapper@2.1 LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion @@ -44,8 +44,8 @@ LOCAL_MODULE := libgralloccore LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData libdl libgrallocutils \ +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 +LOCAL_SHARED_LIBRARIES := $(common_libs) libqdMetaData_sdm710 libdl libgrallocutils \ android.hardware.graphics.mapper@2.1 LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) @@ -69,11 +69,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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 LOCAL_SHARED_LIBRARIES := $(common_libs) \ libhidlbase \ libhidltransport \ - libqdMetaData \ + libqdMetaData_sdm710 \ libgrallocutils \ libgralloccore \ libsync \ @@ -89,11 +89,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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 LOCAL_SHARED_LIBRARIES := $(common_libs) \ libhidlbase \ libhidltransport\ - libqdMetaData \ + libqdMetaData_sdm710 \ libgrallocutils \ libgralloccore \ android.hardware.graphics.mapper@2.1 \ diff --git a/hdmi_cec/Android.mk b/hdmi_cec/Android.mk index a333654c..3a8f7490 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 -LOCAL_SHARED_LIBRARIES := $(common_libs) libqservice libbinder libqdutils +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 +LOCAL_SHARED_LIBRARIES := $(common_libs) libqservice_sdm710 libbinder libqdutils_sdm710 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 58653c16..ce2182af 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 +# LOCAL_HEADER_LIBRARIES := display_headers_sdm710 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 ec9340d2..54d5c1b3 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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 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 97c052b1..58222e2f 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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 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 0c1b96a1..b61de4ab 100644 --- a/libqdutils/Android.bp +++ b/libqdutils/Android.bp @@ -1,11 +1,11 @@ cc_library_shared { - name: "libqdutils", + name: "libqdutils_sdm710", vendor: true, defaults: ["display_defaults"], header_libs: ["libhardware_headers", "libutils_headers"], shared_libs: [ "libbinder", - "libqservice", + "libqservice_sdm710", ], cflags: [ "-DLOG_TAG=\"qdutils\"", @@ -18,7 +18,7 @@ cc_library_shared { } cc_library_shared { - name: "libqdMetaData", + name: "libqdMetaData_sdm710", 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", + name: "libqdMetaData.system_sdm710", defaults: ["display_defaults"], cflags: [ "-Wno-sign-conversion", diff --git a/libqservice/Android.bp b/libqservice/Android.bp index fe69d393..10f6770f 100644 --- a/libqservice/Android.bp +++ b/libqservice/Android.bp @@ -1,5 +1,5 @@ cc_library_shared { - name: "libqservice", + name: "libqservice_sdm710", vendor: true, defaults: ["display_defaults"], shared_libs: ["libbinder"], diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk index d4aa9331..7efda86d 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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 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 a671c31b..7ed04e48 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -9,7 +9,7 @@ LOCAL_VENDOR_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) -LOCAL_HEADER_LIBRARIES := display_headers +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \ -std=c++11 -fcolor-diagnostics\ @@ -17,7 +17,7 @@ LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-par LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \ - libutils libcutils libsync libqdutils libqdMetaData \ + libutils libcutils libsync libqdutils_sdm710 libqdMetaData_sdm710 \ 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 a9d705cd..a44ddcd4 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 +LOCAL_HEADER_LIBRARIES := display_headers_sdm710 LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_SRC_FILES := debug.cpp \ rect.cpp \ -- cgit v1.2.3