diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 19:31:26 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-12 11:22:20 -0800 |
| commit | ff1d8a6635fb6441615778a47e2881129574a5b1 (patch) | |
| tree | d2f490ec6a546461eda288e4383a50796d68059c /media/mca | |
| parent | 34acb4c8d4abe1c4f580b85ddc84b18b7e38e417 (diff) | |
| download | frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.zip frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.tar.gz frameworks_base-ff1d8a6635fb6441615778a47e2881129574a5b1.tar.bz2 | |
Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
Diffstat (limited to 'media/mca')
| -rw-r--r-- | media/mca/filterfw/Android.mk | 1 | ||||
| -rw-r--r-- | media/mca/filterfw/jni/jni_util.h | 6 | ||||
| -rw-r--r-- | media/mca/filterfw/native/libfilterfw.mk | 3 | ||||
| -rw-r--r-- | media/mca/filterpacks/Android.mk | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk index a5b4b27..a63d635 100644 --- a/media/mca/filterfw/Android.mk +++ b/media/mca/filterfw/Android.mk @@ -49,5 +49,4 @@ LOCAL_SHARED_LIBRARIES := \ # part of a system image. LOCAL_PRELINK_MODULE := false -include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) diff --git a/media/mca/filterfw/jni/jni_util.h b/media/mca/filterfw/jni/jni_util.h index 68ff653..11c0871 100644 --- a/media/mca/filterfw/jni/jni_util.h +++ b/media/mca/filterfw/jni/jni_util.h @@ -16,7 +16,7 @@ #include <jni.h> -#include <hash_map> +#include <unordered_map> #include <string> #include "base/utilities.h" @@ -188,8 +188,8 @@ class ObjectPool { id_field_name_(id_fld_name), next_id_(0) { } - typedef std::hash_map<int, T*> CObjMap; - typedef std::hash_map<int, bool> FlagMap; + typedef std::unordered_map<int, T*> CObjMap; + typedef std::unordered_map<int, bool> FlagMap; static ObjectPool* instance_; std::string jclass_name_; std::string id_field_name_; diff --git a/media/mca/filterfw/native/libfilterfw.mk b/media/mca/filterfw/native/libfilterfw.mk index 4e88e6f..69227ce 100644 --- a/media/mca/filterfw/native/libfilterfw.mk +++ b/media/mca/filterfw/native/libfilterfw.mk @@ -18,9 +18,6 @@ FFW_PATH := $(call my-dir) # Uncomment the requirements below, once we need them: -# STLport -include external/stlport/libstlport.mk - # Neven FaceDetect SDK #LOCAL_C_INCLUDES += external/neven/FaceRecEm/common/src/b_FDSDK \ # external/neven/FaceRecEm/common/src \ diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk index d030749..7e8661f 100644 --- a/media/mca/filterpacks/Android.mk +++ b/media/mca/filterpacks/Android.mk @@ -30,8 +30,6 @@ LOCAL_CFLAGS := -DANDROID LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -include external/stlport/libstlport.mk - include $(BUILD_STATIC_LIBRARY) ## |