| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-06-22 07:28:52 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-06-22 07:28:52 (GMT) |
| commit | 70ba7810ab2d7a9ab5873fd9e3d140477a00c686 (patch) | |
| tree | 07b249f140d48bc6d17d7cb169a1ebfe9f218b6b | |
| parent | 0347864be3432ee4953c165a1a5494871cef623d (diff) | |
| parent | 33961db15ad0c29b418c0e743171ad1f7c1150dc (diff) | |
| download | system-70ba7810ab2d7a9ab5873fd9e3d140477a00c686.zip system-70ba7810ab2d7a9ab5873fd9e3d140477a00c686.tar.gz system-70ba7810ab2d7a9ab5873fd9e3d140477a00c686.tar.bz2 | |
Merge "PD#145255: generate amlogic files to vendor/" into l-amlogic
| -rw-r--r-- | libge2d/Android.mk | 15 | ||||
| -rw-r--r-- | libhealthd/Android.mk | 10 | ||||
| -rw-r--r-- | libinstaboot_support/Android.mk | 4 |
3 files changed, 29 insertions, 0 deletions
diff --git a/libge2d/Android.mk b/libge2d/Android.mk index e862933..2541d63 100644 --- a/libge2d/Android.mk +++ b/libge2d/Android.mk @@ -8,6 +8,11 @@ LOCAL_SHARED_LIBRARIES := liblog LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers LOCAL_CFLAGS := -Werror + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_SHARED_LIBRARY) @@ -33,6 +38,11 @@ LOCAL_CFLAGS +=-g LOCAL_CPPFLAGS := -g LOCAL_MODULE := ge2d_feature_test + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_EXECUTABLE) @@ -59,4 +69,9 @@ LOCAL_CFLAGS +=-g LOCAL_CPPFLAGS := -g LOCAL_MODULE := ge2d_load_test + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_EXECUTABLE) diff --git a/libhealthd/Android.mk b/libhealthd/Android.mk index 18454ab..a054b88 100644 --- a/libhealthd/Android.mk +++ b/libhealthd/Android.mk @@ -10,6 +10,11 @@ LOCAL_MODULE := libhealthd.mboxdefault LOCAL_C_INCLUDES := system/core/healthd \ system/core/healthd/include/healthd LOCAL_CFLAGS := -Werror + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -18,6 +23,11 @@ LOCAL_MODULE := libhealthd.tablet LOCAL_C_INCLUDES := system/core/healthd \ system/core/healthd/include/healthd LOCAL_CFLAGS := -Werror + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_STATIC_LIBRARY) endif diff --git a/libinstaboot_support/Android.mk b/libinstaboot_support/Android.mk index f8dbb6e..1943753 100644 --- a/libinstaboot_support/Android.mk +++ b/libinstaboot_support/Android.mk @@ -25,4 +25,8 @@ LOCAL_SHARED_LIBRARIES := \ libc \ libtvplay +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_SHARED_LIBRARY) |