Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e86f8e0 authored by Josh Gao's avatar Josh Gao
Browse files

libcutils: add prefix to local variables in Android.mk.

Change-Id: I0561affbcc306c20f8aa87beb2d9728a9bb79f5e
parent 79cfba55
Loading
Loading
Loading
Loading
+27 −27
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
LOCAL_PATH := $(my-dir)
include $(CLEAR_VARS)

commonSources := \
libcutils_common_sources := \
        hashmap.c \
        atomic.c.arm \
        native_handle.c \
@@ -37,7 +37,7 @@ commonSources := \
# some files must not be compiled when building against Mingw
# they correspond to features not used by our host development tools
# which are also hard or even impossible to port to native Win32
nonWindowsSources := \
libcutils_nonwindows_sources := \
        fs.c \
        multiuser.c \
        socket_inaddr_any_server.c \
@@ -48,7 +48,7 @@ nonWindowsSources := \
        socket_network_client.c \
        sockets.c \

nonWindowsHostSources := \
libcutils_nonwindows_host_sources := \
        ashmem-host.c \
        trace-host.c

@@ -56,9 +56,9 @@ nonWindowsHostSources := \
# Shared and static library for host
# ========================================================
LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES := $(libcutils_common_sources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)
LOCAL_SRC_FILES_linux := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra
LOCAL_CFLAGS_linux := -Werror -Wall -Wextra
@@ -68,9 +68,9 @@ include $(BUILD_HOST_STATIC_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES := $(libcutils_common_sources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)
LOCAL_SRC_FILES_linux := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra
LOCAL_CFLAGS_linux := -Werror -Wall -Wextra
@@ -84,8 +84,8 @@ include $(BUILD_HOST_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) \
        $(nonWindowsSources) \
LOCAL_SRC_FILES := $(libcutils_common_sources) \
        $(libcutils_nonwindows_sources) \
        android_reboot.c \
        ashmem-dev.c \
        debugger.c \