diff options
| author | Lennart Wieboldt <lennart.1997@gmx.de> | 2017-07-25 22:35:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 22:35:56 +0000 |
| commit | e1bcd152f0248582c533522087df4ed8eb523296 (patch) | |
| tree | 9cdc0183dcce6c3415a56ba05245eff7cea7907d | |
| parent | 77d10dc9c9ab6c9f4c863139736df4ff634bbb61 (diff) | |
| parent | 6c8c832d924f33d6f1e9c26b88c73efbbc312c34 (diff) | |
| download | adb-e1bcd152f0248582c533522087df4ed8eb523296.tar.gz | |
Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985
am: 8a8b97b271
Change-Id: I7e691abe2e2ccec5d9477c528d603c081c0a5661
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -108,7 +108,6 @@ LIBADB_TEST_windows_SRCS := \ sysdeps_win32_test.cpp \ include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_MODULE := libadbd_usb LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_SRC_FILES := daemon/usb.cpp @@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_MODULE := libadbd LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_SRC_FILES := \ @@ -171,7 +169,6 @@ LOCAL_MULTILIB := first include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_CLANG := true LOCAL_MODULE := adbd_test LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) LOCAL_SRC_FILES := \ @@ -330,8 +327,6 @@ endif include $(CLEAR_VARS) -LOCAL_CLANG := true - LOCAL_SRC_FILES := \ daemon/main.cpp \ daemon/mdns.cpp \ |