| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-06-22 07:33:35 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-06-22 07:33:35 (GMT) |
| commit | 44155abad6c433e7ded6c9d11e3c1ef10ebe6fe3 (patch) | |
| tree | d21dd7bcd500fae552348b4fb15f68fdebefa855 | |
| parent | 7c368ebef065062c07cf199c0b6787c374ac4040 (diff) | |
| parent | 79c48dc6e8f526970931433197df7bb3767dfe1e (diff) | |
| download | hwcomposer-44155abad6c433e7ded6c9d11e3c1ef10ebe6fe3.zip hwcomposer-44155abad6c433e7ded6c9d11e3c1ef10ebe6fe3.tar.gz hwcomposer-44155abad6c433e7ded6c9d11e3c1ef10ebe6fe3.tar.bz2 | |
Merge "PD#145255: generate amlogic files to vendor/" into pdk2017
| -rw-r--r-- | hwc1.4/Android.mk | 5 | ||||
| -rw-r--r-- | hwc2/platforms/Android.mk | 6 | ||||
| -rw-r--r-- | tvp/Android.mk | 4 |
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 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) |