diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2017-05-15 12:20:07 -0400 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-28 07:56:32 -0700 |
| commit | d5c7954e27a2c9f1f7a224f06ccd697c74f2a657 (patch) | |
| tree | cc82a1a112ad10dcfccba7c9726bc3783fa72695 /libqdutils | |
| parent | 132d5c091bde74565066ce774ad2ee1afd634c26 (diff) | |
| download | display-d5c7954e27a2c9f1f7a224f06ccd697c74f2a657.tar.gz | |
display: Partially convert makefiles to blueprints
Change-Id: I5429ecee3985e305290e312921725460ef195b83
Diffstat (limited to 'libqdutils')
| -rw-r--r-- | libqdutils/Android.bp | 39 | ||||
| -rw-r--r-- | libqdutils/Android.mk | 51 |
2 files changed, 39 insertions, 51 deletions
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp new file mode 100644 index 00000000..a32162fb --- /dev/null +++ b/libqdutils/Android.bp @@ -0,0 +1,39 @@ +cc_library_shared { + name: "libqdutils", + vendor: true, + defaults: ["display_defaults"], + shared_libs: [ + "libbinder", + "libqservice", + ], + cflags: [ + "-DLOG_TAG=\"qdutils\"", + "-Wno-sign-conversion", + ], + srcs: [ + "qd_utils.cpp", + "display_config.cpp", + ], +} + +cc_library_shared { + name: "libqdMetaData", + vendor_available: true, + defaults: ["display_defaults"], + cflags: [ + "-Wno-sign-conversion", + "-DLOG_TAG=\"qdmetadata\"", + ], + srcs: ["qdMetaData.cpp","qd_utils.cpp"], +} + +// Remove after WFD moves to use libqdMetaData directly +cc_library_shared { + name: "libqdMetaData.system", + defaults: ["display_defaults"], + cflags: [ + "-Wno-sign-conversion", + "-DLOG_TAG=\"qdmetadata\"", + ], + srcs: ["qdMetaData.cpp","qd_utils.cpp"], +} diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk deleted file mode 100644 index 820ed87c..00000000 --- a/libqdutils/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/../common.mk -include $(CLEAR_VARS) - -LOCAL_MODULE := libqdutils -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_HEADER_LIBRARIES += libhardware_headers -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := display_config.h qd_utils.h -LOCAL_SRC_FILES := qd_utils.cpp \ - display_config.cpp -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := qdMetaData.h qd_utils.h -LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) -LOCAL_SRC_FILES := qdMetaData.cpp qd_utils.cpp -LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion -LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libqdMetaData -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) - -LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) -LOCAL_SRC_FILES := qdMetaData.cpp qd_utils.cpp -LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion -LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libqdMetaData.system - -include $(BUILD_SHARED_LIBRARY) |