summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bkriebel@vmware.com>2012-12-18 17:39:20 -0700
committercodeworkx <codeworkx@cyanogenmod.org>2012-12-19 16:48:30 +0100
commit4593ebd941446a7b50aac3b2e9e32b574d19f3bd (patch)
treeea142a87c0b7de7e9136c9c4488196066cc44c9c
parentc9288149a35eef64908085d9799f2ba908bfabd2 (diff)
downloadandroid_hardware_samsung-4593ebd941446a7b50aac3b2e9e32b574d19f3bd.tar.gz
android_hardware_samsung-4593ebd941446a7b50aac3b2e9e32b574d19f3bd.tar.bz2
android_hardware_samsung-4593ebd941446a7b50aac3b2e9e32b574d19f3bd.zip
exynos4: Set libgralloc_ump and SecHdmi tags to optional
When LOCAL_MODULE_TAGS was set to eng this broke eng builds due to the lack of source for libsamsungion. Set the tag to optional so it is not built for an eng build. Change-Id: I770c991dc16ccce9905501619e015567110de577
-rw-r--r--exynos4/hal/libgralloc_ump/Android.mk4
-rw-r--r--exynos4/hal/libhdmi/SecHdmi/Android.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/exynos4/hal/libgralloc_ump/Android.mk b/exynos4/hal/libgralloc_ump/Android.mk
index 005c817..85f7337 100644
--- a/exynos4/hal/libgralloc_ump/Android.mk
+++ b/exynos4/hal/libgralloc_ump/Android.mk
@@ -26,7 +26,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libUMP libGLESv1_CM libsamsungion
+LOCAL_SHARED_LIBRARIES := liblog libcutils libUMP libGLESv1_CM libsecion
# Include the UMP header files
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
@@ -36,7 +36,7 @@ LOCAL_SRC_FILES := \
alloc_device.cpp \
framebuffer_device.cpp
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := gralloc.$(TARGET_DEVICE)
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DGRALLOC_32_BITS -DSTANDARD_LINUX_SCREEN
#LOCAL_CFLAGS+= -DMALI_VSYNC_EVENT_REPORT_ENABLE
diff --git a/exynos4/hal/libhdmi/SecHdmi/Android.mk b/exynos4/hal/libhdmi/SecHdmi/Android.mk
index a6921fc..72eb677 100644
--- a/exynos4/hal/libhdmi/SecHdmi/Android.mk
+++ b/exynos4/hal/libhdmi/SecHdmi/Android.mk
@@ -17,7 +17,7 @@ ifeq ($(BOARD_USES_HDMI),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
#LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
@@ -79,7 +79,7 @@ endif
ifeq ($(BOARD_USE_V4L2_ION),true)
LOCAL_CFLAGS += -DBOARD_USE_V4L2_ION
-LOCAL_SHARED_LIBRARIES += libsamsungion
+LOCAL_SHARED_LIBRARIES += libsecion
endif
LOCAL_MODULE := libhdmi