summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2017-06-22 07:34:11 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2017-06-22 07:34:11 (GMT)
commit0714136a27ce93de4d1d5b24ac120801ae163de9 (patch)
tree5d1937ed72ff9512eca565ef3045608593bd445d
parentf61ae3027b3bf5f0325ded0f98ce0aef1a25c7d1 (diff)
parentcc4348c0081a4b41d87851657ad7346b185e1bc5 (diff)
downloadtools-0714136a27ce93de4d1d5b24ac120801ae163de9.zip
tools-0714136a27ce93de4d1d5b24ac120801ae163de9.tar.gz
tools-0714136a27ce93de4d1d5b24ac120801ae163de9.tar.bz2
Merge "PD#145255: generate amlogic files to vendor/" into l-amlogic
Diffstat
-rw-r--r--[-rwxr-xr-x]logo_img_packer/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/logo_img_packer/Android.mk b/logo_img_packer/Android.mk
index 5577873..2bf27d9 100755..100644
--- a/logo_img_packer/Android.mk
+++ b/logo_img_packer/Android.mk
@@ -23,7 +23,6 @@ endif
LOCAL_STATIC_LIBRARIES := libhost
LOCAL_C_INCLUDES := build/libs/host/include
#LOCAL_ACP_UNAVAILABLE := true
-
include $(BUILD_HOST_EXECUTABLE)
# host tool
@@ -34,5 +33,8 @@ LOCAL_SRC_FILES := res_pack.cpp crc32.cpp
LOCAL_MODULE := logo_img_packer
LOCAL_MODULE_TAGS := optional
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
include $(BUILD_EXECUTABLE)