commit a510428eade2776414206de0d40f12943a3b704a
author Yohann Roussel <yroussel@google.com> Wed Apr 08 13:20:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 08 13:20:48 2015 +0000
tree b346643251e7da9c1e8ef2a05a228e4b35d01289
parent 4605be6c9ec9296addc0f0b034ae79db6c14f10e
parent d19166700666d7b84424187c0cdae67a9eb7659e

Merge changes from topic 'jack-server'

* changes:
  Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
  Don't call Jack directly, use the script instead

tools/fs_config/Android.mk

diff --git a/tools/fs_config/Android.mk b/tools/fs_config/Android.mk
index 984e5b0..f4c871a 100644
--- a/tools/fs_config/Android.mk
+++ b/tools/fs_config/Android.mk
@@ -17,7 +17,7 @@
 
 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
 

tools/fs_get_stats/Android.mk

diff --git a/tools/fs_get_stats/Android.mk b/tools/fs_get_stats/Android.mk
index dc5dff9..4501c1f 100644
--- a/tools/fs_get_stats/Android.mk
+++ b/tools/fs_get_stats/Android.mk
@@ -6,6 +6,6 @@
 
 LOCAL_MODULE := fs_get_stats
 
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 include $(BUILD_HOST_EXECUTABLE)