summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-11 22:51:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-11 22:51:18 +0000
commit2f702c9bc0d07f5d48f6f50586b1e11d9ac59381 (patch)
tree519ddfbf39c4eb23ebaeda790eec1c860df62197
parent7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731 (diff)
parent43e10bb74913a9c9e739c1d4cacbed9be885ffa7 (diff)
downloadframeworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.zip
frameworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.tar.gz
frameworks_av-2f702c9bc0d07f5d48f6f50586b1e11d9ac59381.tar.bz2
am 43e10bb7: Merge "Move to libc++."
* commit '43e10bb74913a9c9e739c1d4cacbed9be885ffa7': Move to libc++.
-rw-r--r--drm/mediadrm/plugins/clearkey/Android.mk1
-rw-r--r--drm/mediadrm/plugins/clearkey/tests/Android.mk8
-rw-r--r--services/audioflinger/tests/Android.mk17
3 files changed, 3 insertions, 23 deletions
diff --git a/drm/mediadrm/plugins/clearkey/Android.mk b/drm/mediadrm/plugins/clearkey/Android.mk
index 22a85b4..b713a7f 100644
--- a/drm/mediadrm/plugins/clearkey/Android.mk
+++ b/drm/mediadrm/plugins/clearkey/Android.mk
@@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \
Utils.cpp \
LOCAL_C_INCLUDES := \
- bionic \
external/jsmn \
external/openssl/include \
frameworks/av/drm/mediadrm/plugins/clearkey \
diff --git a/drm/mediadrm/plugins/clearkey/tests/Android.mk b/drm/mediadrm/plugins/clearkey/tests/Android.mk
index ac5bb21..80f94e0 100644
--- a/drm/mediadrm/plugins/clearkey/tests/Android.mk
+++ b/drm/mediadrm/plugins/clearkey/tests/Android.mk
@@ -28,25 +28,17 @@ LOCAL_SRC_FILES := \
JsonWebKeyUnittest.cpp \
LOCAL_C_INCLUDES := \
- bionic \
- external/gtest/include \
external/jsmn \
external/openssl/include \
- external/stlport/stlport \
frameworks/av/drm/mediadrm/plugins/clearkey \
frameworks/av/include \
frameworks/native/include \
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libgtest_main \
-
LOCAL_SHARED_LIBRARIES := \
libcrypto \
libdrmclearkeyplugin \
liblog \
libstagefright_foundation \
- libstlport \
libutils \
include $(BUILD_NATIVE_TEST)
diff --git a/services/audioflinger/tests/Android.mk b/services/audioflinger/tests/Android.mk
index 7bba05b..8935981 100644
--- a/services/audioflinger/tests/Android.mk
+++ b/services/audioflinger/tests/Android.mk
@@ -10,19 +10,10 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libutils \
libcutils \
- libstlport \
libaudioutils \
libaudioresampler
-LOCAL_STATIC_LIBRARIES := \
- libgtest \
- libgtest_main
-
LOCAL_C_INCLUDES := \
- bionic \
- bionic/libstdc++/include \
- external/gtest/include \
- external/stlport/stlport \
$(call include-path-for, audio-utils) \
frameworks/av/services/audioflinger
@@ -32,7 +23,7 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := resampler_tests
LOCAL_MODULE_TAGS := tests
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)
#
# audio mixer test tool
@@ -44,9 +35,6 @@ LOCAL_SRC_FILES:= \
../AudioMixer.cpp.arm \
LOCAL_C_INCLUDES := \
- bionic \
- bionic/libstdc++/include \
- external/stlport/stlport \
$(call include-path-for, audio-effects) \
$(call include-path-for, audio-utils) \
frameworks/av/services/audioflinger
@@ -55,7 +43,6 @@ LOCAL_STATIC_LIBRARIES := \
libsndfile
LOCAL_SHARED_LIBRARIES := \
- libstlport \
libeffects \
libnbaio \
libcommon_time_client \
@@ -70,4 +57,6 @@ LOCAL_MODULE:= test-mixer
LOCAL_MODULE_TAGS := optional
+LOCAL_CXX_STL := libc++
+
include $(BUILD_EXECUTABLE)