summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDima Zavin2011-08-30 11:51:01 -0500
committerAndroid Git Automerger2011-08-30 11:51:01 -0500
commit09e32886e64258c0600e2696e26a2aca559310e2 (patch)
treead213bb5b52a044ea79288c101a2bb39c68a82c7
parentdccddee972e5fd93409dc874e0a46fd5ae659b16 (diff)
parent96a5482b75029129ebeecd543ca6683d2411b9a3 (diff)
downloadplatform-system-core-09e32886e64258c0600e2696e26a2aca559310e2.tar.gz
platform-system-core-09e32886e64258c0600e2696e26a2aca559310e2.tar.xz
platform-system-core-09e32886e64258c0600e2696e26a2aca559310e2.zip
am 96a5482b: am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"
* commit '96a5482b75029129ebeecd543ca6683d2411b9a3': 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 74be2d9bd..9decbb91a 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -10,6 +10,7 @@ commonSources := \
10include $(CLEAR_VARS) 10include $(CLEAR_VARS)
11LOCAL_SRC_FILES := $(commonSources) 11LOCAL_SRC_FILES := $(commonSources)
12LOCAL_MODULE := libdiskconfig 12LOCAL_MODULE := libdiskconfig
13LOCAL_MODULE_TAGS := optional
13LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc 14LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
14include $(BUILD_SHARED_LIBRARY) 15include $(BUILD_SHARED_LIBRARY)
15 16
@@ -17,6 +18,7 @@ ifeq ($(HOST_OS),linux)
17include $(CLEAR_VARS) 18include $(CLEAR_VARS)
18LOCAL_SRC_FILES := $(commonSources) 19LOCAL_SRC_FILES := $(commonSources)
19LOCAL_MODULE := libdiskconfig_host 20LOCAL_MODULE := libdiskconfig_host
21LOCAL_MODULE_TAGS := optional
20LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils 22LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
21LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE 23LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
22include $(BUILD_HOST_STATIC_LIBRARY) 24include $(BUILD_HOST_STATIC_LIBRARY)