am 12e549b0: am 5dc0f5db: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-06-02 08:16:59 -07:00 committed by Android Git Automerger
commit f296c5bc39
1 changed files with 1 additions and 1 deletions

View File

@ -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)