summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-08-29 18:02:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-29 18:02:56 -0700
commit96a5482b75029129ebeecd543ca6683d2411b9a3 (patch)
tree3045f95f9c2207335bb532d843af80d1a36f1ee6
parent549bfcda6df30dd00db254b3717fc8df463ce710 (diff)
parentfd6f38727e3be7d5d9163698b06d61656b2bbe4d (diff)
downloadsystem_core-96a5482b75029129ebeecd543ca6683d2411b9a3.zip
system_core-96a5482b75029129ebeecd543ca6683d2411b9a3.tar.gz
system_core-96a5482b75029129ebeecd543ca6683d2411b9a3.tar.bz2
am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
* commit 'fd6f38727e3be7d5d9163698b06d61656b2bbe4d': libdiskconfig: add missing LOCAL_MODULE_TAGS
-rw-r--r--libdiskconfig/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index c887955..714606a 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -12,6 +12,7 @@ commonSources := \
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libdiskconfig
+LOCAL_MODULE_TAGS := optional
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_SHARED_LIBRARY)
@@ -19,6 +20,7 @@ ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libdiskconfig_host
+LOCAL_MODULE_TAGS := optional
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
include $(BUILD_HOST_STATIC_LIBRARY)