aboutsummaryrefslogtreecommitdiffstats
path: root/adb/Android.mk
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-02 08:13:29 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-02 08:13:29 -0700
commit5dc0f5db7152a604377af30f7d2139a84fd7b30c (patch)
tree09bb7372cb3811176303038fc2c92373439ba618 /adb/Android.mk
parentc57a22c8561cc571d23cd7f321103b2b4d2c7cde (diff)
parent7fe202f160ca1926bc0277e3c276ad7b3f9b9aeb (diff)
downloadsystem_core-5dc0f5db7152a604377af30f7d2139a84fd7b30c.tar.gz
system_core-5dc0f5db7152a604377af30f7d2139a84fd7b30c.tar.bz2
system_core-5dc0f5db7152a604377af30f7d2139a84fd7b30c.zip
merge from open-source master
Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680
Diffstat (limited to 'adb/Android.mk')
-rw-r--r--adb/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index 0c93c1e7..45bdc4b9 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -74,7 +74,7 @@ else
endif
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY
+LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := adb
LOCAL_STATIC_LIBRARIES := libzipfile libunz $(EXTRA_STATIC_LIBS)