summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2017-05-31 03:19:29 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2017-06-02 02:48:31 (GMT)
commit79c48dc6e8f526970931433197df7bb3767dfe1e (patch)
treee53a468e8897f65c323393de4b388a24afb31289
parentdf21d4b011c19e84fb1aa9d0c5a70c5db5eae489 (diff)
downloadhwcomposer-79c48dc6e8f526970931433197df7bb3767dfe1e.zip
hwcomposer-79c48dc6e8f526970931433197df7bb3767dfe1e.tar.gz
hwcomposer-79c48dc6e8f526970931433197df7bb3767dfe1e.tar.bz2
PD#145255: generate amlogic files to vendor/
Change-Id: If91f1ef36ae26ac6714445ebf4d1b684b761652d
Diffstat
-rw-r--r--hwc1.4/Android.mk5
-rw-r--r--hwc2/platforms/Android.mk6
-rw-r--r--tvp/Android.mk4
3 files changed, 14 insertions, 1 deletions
diff --git a/hwc1.4/Android.mk b/hwc1.4/Android.mk
index 13f18e3..9991bb5 100644
--- a/hwc1.4/Android.mk
+++ b/hwc1.4/Android.mk
@@ -51,5 +51,10 @@ endif
LOCAL_MODULE := hwcomposer.amlogic
LOCAL_CFLAGS += -DLOG_TAG=\"hwcomposer\"
LOCAL_MODULE_TAGS := optional
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/hwc2/platforms/Android.mk b/hwc2/platforms/Android.mk
index fe6ab7a..896cfcc 100644
--- a/hwc2/platforms/Android.mk
+++ b/hwc2/platforms/Android.mk
@@ -3,13 +3,17 @@
#
LOCAL_PATH := $(call my-dir)
-include $(TOP)/hardware/amlogic/media/media_base_config.mk
+#include $(TOP)/hardware/amlogic/media/media_base_config.mk
# HAL module implemenation, not prelinked and stored in
# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
LOCAL_SRC_FILES := \
../common/base/HwcLayer.cpp \
../common/base/HwcFenceControl.cpp \
diff --git a/tvp/Android.mk b/tvp/Android.mk
index 068106e..5cf0244 100644
--- a/tvp/Android.mk
+++ b/tvp/Android.mk
@@ -8,4 +8,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= libomxutil
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
include $(BUILD_STATIC_LIBRARY)