Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43e10bb7 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Move to libc++."

parents 9527a598 effaa783

drm/mediadrm/plugins/clearkey/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \ 
    Utils.cpp \



LOCAL_C_INCLUDES := \

    bionic \

    external/jsmn \

    external/openssl/include \

    frameworks/av/drm/mediadrm/plugins/clearkey \

drm/mediadrm/plugins/clearkey/tests/Android.mk

+0 −8
Original line number Diff line number Diff line
@@ -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)

services/audioflinger/tests/Android.mk

+3 −14
Original line number Diff line number Diff line
@@ -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)