| commit | f296c5bc3942723a6558d9accf17fb052924f3f3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 08:16:59 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 08:16:59 2010 -0700 |
| tree | 13cd25da63b5a2803aaee2cb7ae36f2856e091b3 | |
| parent | f35012b0930fd2f5e1b67929b6f0abf636fc4f20 [diff] | |
| parent | 12e549b0061940593bf0cfbf0d4d10e6672a4c84 [diff] |
am 12e549b0: am 5dc0f5db: merge from open-source master
diff --git a/adb/Android.mk b/adb/Android.mk index 6fea574..d108972 100644 --- a/adb/Android.mk +++ b/adb/Android.mk
@@ -74,7 +74,7 @@ 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)