diff options
| author | Benoit Goby <benoit@android.com> | 2012-03-14 12:58:20 -0700 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2012-03-16 15:29:34 -0700 |
| commit | 9f1af8cde988e8a276753db6019e8c7d94f0e2b4 (patch) | |
| tree | e2b45cecf406d3d1d861dff5dbe0d0c9c1927a45 /adb | |
| parent | 0ad682cddef396c91707a31d4982dc55206dca1b (diff) | |
| download | system_core-9f1af8cde988e8a276753db6019e8c7d94f0e2b4.zip system_core-9f1af8cde988e8a276753db6019e8c7d94f0e2b4.tar.gz system_core-9f1af8cde988e8a276753db6019e8c7d94f0e2b4.tar.bz2 | |
adb: Remove unused flags
BUILD_ADBD is always true
ANDROID_GADGET is not used in the code anymore. adbd now checks at
runtime if /dev/android_adb is present
Change-Id: If6c3278606c79cc74d1ef5978e7b8e3a4513aef8
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 248208a..1a25106 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -95,16 +95,6 @@ endif # adbd device daemon # ========================================================= -BUILD_ADBD := true - -# build adbd for the Linux simulator build -# so we can use it to test the adb USB gadget driver on x86 -#ifeq ($(HOST_OS),linux) -# BUILD_ADBD := true -#endif - - -ifeq ($(BUILD_ADBD),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ @@ -127,12 +117,6 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -# TODO: This should probably be board specific, whether or not the kernel has -# the gadget driver; rather than relying on the architecture type. -ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -DANDROID_GADGET=1 -endif - ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1 endif @@ -146,8 +130,6 @@ LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) LOCAL_STATIC_LIBRARIES := libcutils libc include $(BUILD_EXECUTABLE) -endif - # adb host tool for device-as-host # ========================================================= |