| commit | 41dca403766d22373ba469d99ba1625d0930d02e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Nov 26 22:20:38 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Nov 26 22:20:38 2015 +0000 |
| tree | 7fd8c656f6400c8020524a7bac356976bcbd212a | |
| parent | c97b5272d715ab9f4ff52748bd2f403235f94426 [diff] | |
| parent | 39cca23d41fde06f6116ae399da2b23eb2a0030f [diff] |
Merge "Revert "Use libstdc++ for ijar""
diff --git a/tools/ijar/Android.mk b/tools/ijar/Android.mk index 94237c4..356e109 100644 --- a/tools/ijar/Android.mk +++ b/tools/ijar/Android.mk
@@ -6,10 +6,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := .cc +LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := classfile.cc ijar.cc zip.cc LOCAL_CFLAGS += -Wall LOCAL_SHARED_LIBRARIES := libz-host LOCAL_MODULE := ijar -LOCAL_CXX_STL := libstdc++ include $(BUILD_HOST_EXECUTABLE)