resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp (437d6982) · Commits · e / os / android_system_core

libcutils/Android.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ LOCAL_MODULE := libcutils
		LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
		LOCAL_STATIC_LIBRARIES := liblog
		ifneq ($(HOST_OS),windows)
		LOCAL_CFLAGS += -Werror
		LOCAL_CFLAGS += -Werror -Wall -Wextra
		endif
		LOCAL_MULTILIB := both
		include $(BUILD_HOST_STATIC_LIBRARY)
		@@ -83,7 +83,7 @@ LOCAL_MODULE := libcutils
		LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
		LOCAL_SHARED_LIBRARIES := liblog
		ifneq ($(HOST_OS),windows)
		LOCAL_CFLAGS += -Werror
		LOCAL_CFLAGS += -Werror -Wall -Wextra
		endif
		LOCAL_MULTILIB := both
		include $(BUILD_HOST_SHARED_LIBRARY)
		@@ -125,7 +125,7 @@ LOCAL_STATIC_LIBRARIES := liblog
		ifneq ($(ENABLE_CPUSETS),)
		LOCAL_CFLAGS += -DUSE_CPUSETS
		endif
		LOCAL_CFLAGS += -Werror -std=gnu90
		LOCAL_CFLAGS += -Werror -Wall -Wextra -std=gnu90
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		@@ -137,7 +137,7 @@ LOCAL_SHARED_LIBRARIES := liblog
		ifneq ($(ENABLE_CPUSETS),)
		LOCAL_CFLAGS += -DUSE_CPUSETS
		endif
		LOCAL_CFLAGS += -Werror
		LOCAL_CFLAGS += -Werror -Wall -Wextra
		LOCAL_C_INCLUDES := $(libcutils_c_includes)
		include $(BUILD_SHARED_LIBRARY)

+1 −2

Original line number	Diff line number	Diff line
		@@ -167,8 +167,7 @@ static int fs_config_open(int dir, const char *target_out_path)
		if (target_out_path[target_out_path_len] == '/') {
		skip_len++;
		}
		asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len);
		if (name) {
		if (asprintf(&name, "%s%s", target_out_path, (dir ? conf_dir : conf_file) + skip_len) != -1) {
		fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY \| O_BINARY));
		free(name);
		}