From 15e82d645996b743ccd5838f9e7bedbc6749ea70 Mon Sep 17 00:00:00 2001 From: Ramakant Singh Date: Fri, 5 Apr 2019 19:16:41 +0530 Subject: [PATCH] libdisplayconfig: Add vendor support Change-Id: Id58a8ba23acb491a1f76a4a28d2db38e7468a63b --- libdisplayconfig/Android.bp | 20 ++++++++++++++++++++ libdisplayconfig/Android.mk | 26 -------------------------- 2 files changed, 20 insertions(+), 26 deletions(-) create mode 100644 libdisplayconfig/Android.bp delete mode 100644 libdisplayconfig/Android.mk diff --git a/libdisplayconfig/Android.bp b/libdisplayconfig/Android.bp new file mode 100644 index 00000000..c1cc51c1 --- /dev/null +++ b/libdisplayconfig/Android.bp @@ -0,0 +1,20 @@ +cc_library_shared { + name: "libdisplayconfig", + vendor_available: true, + cflags: [ + "-Wno-sign-conversion", + "-DLOG_TAG=\"libdisplayconfig\"", + "-DDISPLAY_CONFIG_1_4" + ], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libutils", + "vendor.display.config@1.0", + "vendor.display.config@1.4" + ], + header_libs: ["libhardware_headers", "display_intf_headers"], + srcs: ["DisplayConfig.cpp"], + export_header_lib_headers: ["display_intf_headers"], +} + diff --git a/libdisplayconfig/Android.mk b/libdisplayconfig/Android.mk deleted file mode 100644 index 50618868..00000000 --- a/libdisplayconfig/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -display_config_version := $(shell \ - if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.4" ];\ - then echo DISPLAY_CONFIG_1_4; fi) - -include $(CLEAR_VARS) -LOCAL_MODULE := libdisplayconfig -LOCAL_MODULE_TAGS := optional -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_SRC_FILES := DisplayConfig.cpp -LOCAL_SHARED_LIBRARIES := libhidlbase libhidltransport libutils \ - vendor.display.config@1.0 - -ifeq ($(display_config_version), DISPLAY_CONFIG_1_4) - LOCAL_SHARED_LIBRARIES += vendor.display.config@1.4 - LOCAL_CFLAGS += -DDISPLAY_CONFIG_1_4 -endif - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -ifeq ($(LLVM_SA), true) - LOCAL_CFLAGS += --compile-and-analyze --analyzer-perf --analyzer-Werror -endif - -include $(BUILD_SHARED_LIBRARY)