summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDima Zavin2011-08-29 20:02:56 -0500
committerAndroid Git Automerger2011-08-29 20:02:56 -0500
commit96a5482b75029129ebeecd543ca6683d2411b9a3 (patch)
tree3045f95f9c2207335bb532d843af80d1a36f1ee6 /libdiskconfig
parent549bfcda6df30dd00db254b3717fc8df463ce710 (diff)
parentfd6f38727e3be7d5d9163698b06d61656b2bbe4d (diff)
downloadplatform-system-core-96a5482b75029129ebeecd543ca6683d2411b9a3.tar.gz
platform-system-core-96a5482b75029129ebeecd543ca6683d2411b9a3.tar.xz
platform-system-core-96a5482b75029129ebeecd543ca6683d2411b9a3.zip
am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
* commit 'fd6f38727e3be7d5d9163698b06d61656b2bbe4d': libdiskconfig: add missing LOCAL_MODULE_TAGS
Diffstat (limited to 'libdiskconfig')
-rw-r--r--libdiskconfig/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index c887955ea..714606a5c 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -12,6 +12,7 @@ commonSources := \
12include $(CLEAR_VARS) 12include $(CLEAR_VARS)
13LOCAL_SRC_FILES := $(commonSources) 13LOCAL_SRC_FILES := $(commonSources)
14LOCAL_MODULE := libdiskconfig 14LOCAL_MODULE := libdiskconfig
15LOCAL_MODULE_TAGS := optional
15LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc 16LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
16include $(BUILD_SHARED_LIBRARY) 17include $(BUILD_SHARED_LIBRARY)
17 18
@@ -19,6 +20,7 @@ ifeq ($(HOST_OS),linux)
19include $(CLEAR_VARS) 20include $(CLEAR_VARS)
20LOCAL_SRC_FILES := $(commonSources) 21LOCAL_SRC_FILES := $(commonSources)
21LOCAL_MODULE := libdiskconfig_host 22LOCAL_MODULE := libdiskconfig_host
23LOCAL_MODULE_TAGS := optional
22LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils 24LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
23LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE 25LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
24include $(BUILD_HOST_STATIC_LIBRARY) 26include $(BUILD_HOST_STATIC_LIBRARY)