aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-07 16:40:05 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-07 16:40:06 +0000
commit011a50e4e1cc7371d8fbd0ea08002241fe54a675 (patch)
tree5b3ae6cf867bb7dfb4f8444603129d3097e0ea86
parentb4b996a8ee26553e29f7610f97041753ddff3e68 (diff)
parent27ac7a9c1a87df700109f86980643c4191baab5e (diff)
downloadbuild_make-android-wear-5.1.0_r1.tar.gz
build_make-android-wear-5.1.0_r1.tar.bz2
build_make-android-wear-5.1.0_r1.zip
Merge changes I75d472ed,I6d681071android-wear-5.1.1_r1android-wear-5.1.0_r1
* changes: fs_get_stats: add logging fs_config: add logging
-rw-r--r--tools/fs_config/Android.mk2
-rw-r--r--tools/fs_get_stats/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index 984e5b0ba4..f4c871a64a 100644
--- a/tools/fs_config/Android.mk
+++ b/tools/fs_config/Android.mk
@@ -17,7 +17,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := fs_config.c
LOCAL_MODULE := fs_config
-LOCAL_STATIC_LIBRARIES := libcutils libselinux
+LOCAL_STATIC_LIBRARIES := libcutils liblog libselinux
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_CFLAGS := -Werror
diff --git a/tools/fs_get_stats/Android.mk b/tools/fs_get_stats/Android.mk
index dc5dff93d7..4501c1f20a 100644
--- a/tools/fs_get_stats/Android.mk
+++ b/tools/fs_get_stats/Android.mk
@@ -6,6 +6,6 @@ LOCAL_SRC_FILES := fs_get_stats.c
LOCAL_MODULE := fs_get_stats
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := libcutils liblog
include $(BUILD_HOST_EXECUTABLE)