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

resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp

Browse source 
Change-Id: Id84946b67f207a7586cfa9c918ee6e4ae335fe86
This commit is contained in:
Elliott Hughes 2015-07-24 20:02:31 -07:00
commit 8b262b9de4
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)
@ -125,7 +125,7 @@ LOCAL_STATIC_LIBRARIES := liblog
ifneq ($(ENABLE_CPUSETS),) ifneq ($(ENABLE_CPUSETS),)
LOCAL_CFLAGS += -DUSE_CPUSETS LOCAL_CFLAGS += -DUSE_CPUSETS
endif endif
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)
@ -137,7 +137,7 @@ LOCAL_SHARED_LIBRARIES := liblog
ifneq ($(ENABLE_CPUSETS),) ifneq ($(ENABLE_CPUSETS),)
LOCAL_CFLAGS += -DUSE_CPUSETS LOCAL_CFLAGS += -DUSE_CPUSETS
endif endif
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

@ -167,8 +167,7 @@ static int fs_config_open(int dir, const char *target_out_path)
if (target_out_path[target_out_path_len] == '/') { if (target_out_path[target_out_path_len] == '/') {
skip_len++; skip_len++;
} }
asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len); if (asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len) != -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);
} }