ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am bb4370f8: Merge "Turn on warnings for libcutils, fix a bug."

Browse source 
* commit 'bb4370f833a661033184d258892906d63a347571':
  Turn on warnings for libcutils, fix a bug.
This commit is contained in:
Elliott Hughes 2015-07-25 02:01:34 +00:00 • committed by Android Git Automerger
commit 038b76c23e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libcutils/Android.mk
View file

@ -73,7 +73,7 @@ LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
ifneq ($(HOST_OS),windows) ifneq ($(HOST_OS),windows)
LOCAL_CFLAGS += -Werror LOCAL_CFLAGS += -Werror -Wall -Wextra
endif endif
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
@ -83,7 +83,7 @@ LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
ifneq ($(HOST_OS),windows) ifneq ($(HOST_OS),windows)
LOCAL_CFLAGS += -Werror LOCAL_CFLAGS += -Werror -Wall -Wextra
endif endif
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)
@ -122,7 +122,7 @@ LOCAL_SRC_FILES_x86_64 += \
LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_C_INCLUDES := $(libcutils_c_includes)
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += -Werror -std=gnu90 LOCAL_CFLAGS += -Werror -Wall -Wextra -std=gnu90
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -131,7 +131,7 @@ LOCAL_MODULE := libcutils
# liblog symbols present in libcutils. # liblog symbols present in libcutils.
LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS += -Werror LOCAL_CFLAGS += -Werror -Wall -Wextra
LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_C_INCLUDES := $(libcutils_c_includes)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

3
libcutils/fs_config.c
View file

@ -160,8 +160,7 @@ static int fs_config_open(int dir)
const char *out = getenv("OUT"); const char *out = getenv("OUT");
if (out && *out) { if (out && *out) {
char *name = NULL; char *name = NULL;
asprintf(&name, "%s%s", out, dir ? conf_dir : conf_file); if (asprintf(&name, "%s%s", out, dir ? conf_dir : conf_file) != -1) {
if (name) {
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY)); fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY));
free(name); free(name);
} }