summaryrefslogtreecommitdiff
path: root/libqdutils
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-10 02:25:40 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-10 02:25:40 -0700
commit1316c609d0db42e71a4de75a715638dc9fda9e3f (patch)
treece3960132390f8b5198aa3cb0e5780d55bafb18c /libqdutils
parente12ada0b7530711530c8bbc75d354358f8f5584e (diff)
parent069dd051c8770f5ca12c3a7d5270dd7872b2ebfd (diff)
downloaddisplay-1316c609d0db42e71a4de75a715638dc9fda9e3f.tar.gz
Merge "qdutils: Generate system image copy for qdmetadata"
Diffstat (limited to 'libqdutils')
-rw-r--r--libqdutils/Android.mk19
1 files changed, 17 insertions, 2 deletions
diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk
index 7afd00fe..60efb3a0 100644
--- a/libqdutils/Android.mk
+++ b/libqdutils/Android.mk
@@ -20,12 +20,12 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
-LOCAL_COPY_HEADERS := qdMetaData.h
+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
+LOCAL_SRC_FILES := qdMetaData.cpp qd_utils.cpp
LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion
LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\"
@@ -34,3 +34,18 @@ 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)