commit 8713fde1c3edf9dd6c5799cd3cc25b8f2ec2cb2d
author Colin Cross <ccross@android.com> Thu Nov 26 22:14:40 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 26 22:14:40 2015 +0000
tree 3dac138604ce92938991c43b8ae05084d705ba89
parent 93e138b7238153f65844df3d2d9be1156d86c399
parent 4c1944083f03e1ddf55f16f815b89a337ffc60f6

Merge "Use libstdc++ for ijar" am: c97b5272d7
am: 4c1944083f

* commit '4c1944083f03e1ddf55f16f815b89a337ffc60f6':
  Use libstdc++ for ijar

tools/ijar/Android.mk

diff --git a/tools/ijar/Android.mk b/tools/ijar/Android.mk
index 356e109..94237c4 100644
--- a/tools/ijar/Android.mk
+++ b/tools/ijar/Android.mk
@@ -6,9 +6,10 @@
 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)