commit 39358fee98a9e7f8aed91d07769ffb63c875b074
author Josh Gao <jmgao@google.com> Thu Jul 27 15:37:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 15:37:29 2017 +0000
tree 7c5efa197776eb8273c15f128983deb51f917d21
parent cb290931bfdf28aa227b6ec98e6fa073a5f2f50c
parent f80d72763f2215d912933f51f6990ca0b97aa721

Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev am: 4ee59e0b51
am: 60364171da

Change-Id: I898d52216a39864c724da3e60cd7feee3439a79f

Android.mk

diff --git a/Android.mk b/Android.mk
index 5913d94..5d6c418 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,7 +108,6 @@
     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 @@
 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 @@
 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 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_CLANG := true
-
 LOCAL_SRC_FILES := \
     daemon/main.cpp \
     daemon/mdns.cpp \