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

Merge "Add a project wide clang switch."

Browse source
This commit is contained in:
Dan Albert 2015-02-25 00:20:37 +00:00 • committed by Gerrit Code Review
commit 5329d3fd54
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/Android.mk
View file

@ -5,6 +5,8 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
ADB_CLANG :=
# libadb # 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 LIBADB_windows_SRC_FILES := get_my_path_windows.c sysdeps_win32.c usb_windows.c
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := $(ADB_CLANG)
LOCAL_MODULE := libadbd LOCAL_MODULE := libadbd
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -46,6 +49,7 @@ LOCAL_SRC_FILES := \
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := $(ADB_CLANG)
LOCAL_MODULE := libadb LOCAL_MODULE := libadb
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1 LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -86,6 +90,8 @@ ifeq ($(HOST_OS),windows)
endif endif
endif endif
LOCAL_CLANG := $(ADB_CLANG)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
adb_main.c \ adb_main.c \
console.c \ console.c \
@ -130,6 +136,8 @@ endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := $(ADB_CLANG)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
adb_main.c \ adb_main.c \
services.c \ services.c \