From 718bab6aecfe7e23a6afa1361da64c8e0c832705 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 26 Nov 2015 14:08:34 -0800
Subject: [PATCH] Use libstdc++ for ijar

For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.

Change-Id: I8e900b0f764f0bb8f827705cb9173f07e4f33862
---
 tools/ijar/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ijar/Android.mk b/tools/ijar/Android.mk
index 356e109b7..94237c459 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)