summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-15 22:56:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 22:56:22 +0000
commita910c7bd589b8b3692001df260873df32db0dbf5 (patch)
treeddd34f425074edfefba3531f31f759320621c004 /tools
parent97952ce8ac7ce64b637af345e46411aca3af8d21 (diff)
parent54c1d36eaee59c62a652b071bdec9e71c40002ae (diff)
downloadbuild-a910c7bd589b8b3692001df260873df32db0dbf5.zip
build-a910c7bd589b8b3692001df260873df32db0dbf5.tar.gz
build-a910c7bd589b8b3692001df260873df32db0dbf5.tar.bz2
am 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"
* commit '54c1d36eaee59c62a652b071bdec9e71c40002ae': fs_config: use libcutils and libselinux shared libraries
Diffstat (limited to 'tools')
-rw-r--r--tools/fs_config/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index f4c871a..3e16962 100644
--- a/tools/fs_config/Android.mk
+++ b/tools/fs_config/Android.mk
@@ -13,12 +13,12 @@
# limitations under the License.
LOCAL_PATH := $(call my-dir)
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := fs_config.c
LOCAL_MODULE := fs_config
-LOCAL_STATIC_LIBRARIES := libcutils liblog libselinux
-LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_SHARED_LIBRARIES := libcutils libselinux
LOCAL_CFLAGS := -Werror
include $(BUILD_HOST_EXECUTABLE)