diff options
Diffstat (limited to 'tools/aapt/Android.mk')
| -rw-r--r-- | tools/aapt/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2cbabe1..f530c13 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -46,7 +46,6 @@ aaptSources := \ WorkQueue.cpp \ ZipEntry.cpp \ ZipFile.cpp \ - qsort_r_compat.c aaptTests := \ tests/AaptConfig_test.cpp \ @@ -152,8 +151,6 @@ LOCAL_MODULE := aapt LOCAL_SRC_FILES := $(aaptSources) $(aaptMain) LOCAL_C_INCLUDES += \ $(aaptCIncludes) \ - bionic \ - external/stlport/stlport LOCAL_SHARED_LIBRARIES := \ libandroidfw \ @@ -164,12 +161,12 @@ LOCAL_SHARED_LIBRARIES := \ libz LOCAL_STATIC_LIBRARIES := \ - libstlport_static \ libexpat_static LOCAL_CFLAGS += $(aaptCFlags) LOCAL_CPPFLAGS += -Wno-non-virtual-dtor +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) endif # Not SDK_ONLY |