am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071

* commit 'bf2474fba4dc446b4b580f4122d172e011c24ba1':
  fs_get_stats: add logging
  fs_config: add logging
This commit is contained in:
Mark Salyzyn 2015-04-07 16:58:02 +00:00 committed by Android Git Automerger
commit e2925213a7
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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)