diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 00:20:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-25 00:20:39 +0000 |
| commit | 5329d3fd54fa875bb7de78a8c40134cc63921c64 (patch) | |
| tree | 30752f263d4c76583a2b0f0c6507320611e381f0 | |
| parent | 70385f3017366ecf06af7a073a2fb955e93d01ba (diff) | |
| parent | 9697ce520d47500a72c95bb7f688ff2f273c9070 (diff) | |
| download | system_core-5329d3fd54fa875bb7de78a8c40134cc63921c64.zip system_core-5329d3fd54fa875bb7de78a8c40134cc63921c64.tar.gz system_core-5329d3fd54fa875bb7de78a8c40134cc63921c64.tar.bz2 | |
Merge "Add a project wide clang switch."
| -rw-r--r-- | adb/Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 327591f..da5015a 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -5,6 +5,8 @@ LOCAL_PATH:= $(call my-dir) +ADB_CLANG := + # libadb # ========================================================= @@ -33,6 +35,7 @@ LIBADB_linux_SRC_FILES := fdevent.cpp get_my_path_linux.c usb_linux.c LIBADB_windows_SRC_FILES := get_my_path_windows.c sysdeps_win32.c usb_windows.c include $(CLEAR_VARS) +LOCAL_CLANG := $(ADB_CLANG) LOCAL_MODULE := libadbd LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_SRC_FILES := \ @@ -46,6 +49,7 @@ LOCAL_SRC_FILES := \ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_CLANG := $(ADB_CLANG) LOCAL_MODULE := libadb LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1 LOCAL_SRC_FILES := \ @@ -86,6 +90,8 @@ ifeq ($(HOST_OS),windows) endif endif +LOCAL_CLANG := $(ADB_CLANG) + LOCAL_SRC_FILES := \ adb_main.c \ console.c \ @@ -130,6 +136,8 @@ endif include $(CLEAR_VARS) +LOCAL_CLANG := $(ADB_CLANG) + LOCAL_SRC_FILES := \ adb_main.c \ services.c \ |