From 44155abad6c433e7ded6c9d11e3c1ef10ebe6fe3 Mon Sep 17 00:00:00 2001
From: Tellen Yu<tellen.yu@amlogic.com>
Date: Thu, 22  Jun  2017  07:33:35  +0000
Subject: Merge "PD#145255: generate amlogic files to vendor/" into pdk2017

---
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 2d86507..1207334 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)
--
cgit