summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2018-01-06 18:00:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-06 18:00:35 +0000
commit268c9153a37d5637f81670fbae117625818d3083 (patch)
tree694e0d3e9341d7190ecac7c111240a0f16a6921c
parentedb2373362710a3223057e200c58526c4fb76965 (diff)
parent6924e012fde5f8e8b1f1e710de4908bc3fe6757a (diff)
downloadandroid_packages_apps_Gallery2-268c9153a37d5637f81670fbae117625818d3083.tar.gz
android_packages_apps_Gallery2-268c9153a37d5637f81670fbae117625818d3083.tar.bz2
android_packages_apps_Gallery2-268c9153a37d5637f81670fbae117625818d3083.zip
Merge "Move from stlport to libc++."
am: 6924e012fd Change-Id: I609e738ed6ea191c2c926dc3ade190c652726d20
-rw-r--r--jni_jpegstream/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index cac2a7b72..7b4d9a471 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libjni_jpegstream
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/src