Merge "Fix build."

libwvdrmengine/cdm/Android.mk

@@ -5,8 +5,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := \
-    bionic \
-    external/stlport/stlport \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
@@ -38,7 +36,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE := libcdm
 LOCAL_MODULE_TAGS := optional
-
 LOCAL_MODULE_TARGET_ARCH := arm mips x86
+LOCAL_CXX_STL := stlport
 
 include $(BUILD_STATIC_LIBRARY)

libwvdrmengine/cdm/test/unit-test.mk

@@ -18,10 +18,8 @@ LOCAL_SRC_FILES := \
     ../core/test/url_request.cpp
 
 LOCAL_C_INCLUDES := \
-    bionic \
     external/gtest/include \
     external/openssl/include \
-    external/stlport/stlport \
     vendor/widevine/libwvdrmengine/android/cdm/test \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/test \
@@ -37,8 +35,8 @@ LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
     libgmock \
-    libgtest \
-    libgtest_main \
+    libgtest_ndk \
+    libgtest_main_ndk \
     libwvlevel3 \
     libcdm_utils \
     libprotobuf-cpp-2.3.0-lite
@@ -49,7 +47,6 @@ LOCAL_SHARED_LIBRARIES := \
     libdl \
     liblog \
     libssl \
-    libstlport \
     libutils
 
 LOCAL_CFLAGS += -DUNIT_TEST
@@ -61,4 +58,6 @@ LOCAL_CFLAGS += \
 
 LOCAL_MODULE_TARGET_ARCH := arm mips x86
 
+LOCAL_CXX_STL := stlport
+
 include $(BUILD_EXECUTABLE)