diff options
| author | Josh Gao <jmgao@google.com> | 2015-11-17 14:17:38 -0800 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2015-11-24 08:45:07 -0800 |
| commit | 9e86f8e0365d3798cead67d229f1afe6c6bb2130 (patch) | |
| tree | eb0dc1159092dfd6f1e3490d14b0a949f41abb3f | |
| parent | 79cfba55e9d1ff72930f2c10dd5805864baf4276 (diff) | |
| download | core-9e86f8e0365d3798cead67d229f1afe6c6bb2130.tar.gz core-9e86f8e0365d3798cead67d229f1afe6c6bb2130.tar.bz2 core-9e86f8e0365d3798cead67d229f1afe6c6bb2130.zip | |
libcutils: add prefix to local variables in Android.mk.
Change-Id: I0561affbcc306c20f8aa87beb2d9728a9bb79f5e
| -rw-r--r-- | libcutils/Android.mk | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 3ca544f04..6b0ed88e9 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -16,28 +16,28 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) -commonSources := \ - hashmap.c \ - atomic.c.arm \ - native_handle.c \ - config_utils.c \ - load_file.c \ - strlcpy.c \ - open_memstream.c \ - strdup16to8.c \ - strdup8to16.c \ - record_stream.c \ - process_name.c \ - threads.c \ - sched_policy.c \ - iosched_policy.c \ - str_parms.c \ - fs_config.c +libcutils_common_sources := \ + hashmap.c \ + atomic.c.arm \ + native_handle.c \ + config_utils.c \ + load_file.c \ + strlcpy.c \ + open_memstream.c \ + strdup16to8.c \ + strdup8to16.c \ + record_stream.c \ + process_name.c \ + threads.c \ + sched_policy.c \ + iosched_policy.c \ + str_parms.c \ + fs_config.c # 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 \ |