OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
edb2373
)
Merge "Move from stlport to libc++."
author
Dan Albert
<danalbert@google.com>
Sat, 6 Jan 2018 18:00:35 +0000
(18:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 6 Jan 2018 18:00:35 +0000
(18:00 +0000)
am:
6924e012fd
Change-Id: I609e738ed6ea191c2c926dc3ade190c652726d20
jni_jpegstream/Android.mk
patch
|
blob
|
history
diff --git
a/jni_jpegstream/Android.mk
b/jni_jpegstream/Android.mk
index
cac2a7b
..
7b4d9a4
100644
(file)
--- 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