From 670993262f57c37890cb4b1c600faa4a49434829 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 25 Nov 2014 13:33:00 -0800 Subject: [PATCH] Fix build. This project is still using stlport (without telling the build system about it), which was causing (broken) stlport headers to override libc++ headers, leading to a broken copy of std::enable_if, which in turn caused to fail to compile. Since this project has prebuilts that will need to be updated before this project can actually move away from stlport, tell the build system that it is still using stlport for now. Bug: 18433002 Change-Id: I38b356428977ed2184eb28a07bd5e7424a4ace8d (cherry picked from commit de4bc347191dfb4858d29d8a6e6ceba865635615) --- libwvdrmengine/Android.mk | 13 ++++--------- libwvdrmengine/cdm/Android.mk | 4 +--- libwvdrmengine/cdm/test/unit-test.mk | 9 ++++----- libwvdrmengine/mediacrypto/Android.mk | 4 ++-- libwvdrmengine/mediacrypto/test/Android.mk | 7 +++---- libwvdrmengine/mediadrm/Android.mk | 4 ++-- libwvdrmengine/mediadrm/test/Android.mk | 7 +++---- libwvdrmengine/oemcrypto/mock/Android.mk | 5 +---- libwvdrmengine/oemcrypto/test/Android.mk | 9 ++++----- libwvdrmengine/test/unit/Android.mk | 8 ++++---- proprietary/drmwvmplugin/Android.mk | 1 + proprietary/drmwvmplugin/common.mk | 3 --- proprietary/drmwvmplugin/test/Android.mk | 4 +--- proprietary/streamcontrol/test/Android.mk | 5 ++--- proprietary/wvm/Android.mk | 1 + proprietary/wvm/common.mk | 3 --- proprietary/wvm/test/Android.mk | 5 ++--- 17 files changed, 35 insertions(+), 57 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 34681f98..b9e301ab 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -12,8 +12,6 @@ LOCAL_MODULE := libcdm_utils LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport \ vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ @@ -31,6 +29,7 @@ LOCAL_SRC_FILES := third_party/stringencoders/src/modp_b64w.cpp \ $(SRC_DIR)/properties_android.cpp \ $(SRC_DIR)/timer.cpp \ +LOCAL_CXX_STL := stlport include $(BUILD_STATIC_LIBRARY) # ----------------------------------------------------------------------------- @@ -42,10 +41,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := libcdm_protos LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport - LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src) generated_sources_dir := $(call local-generated-sources-dir) @@ -60,6 +55,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(generated_sources_dir)/proto \ $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src +LOCAL_CXX_STL := stlport include $(BUILD_STATIC_LIBRARY) # proto_generated_headers is a build system internal variable defined in @@ -80,8 +76,6 @@ LOCAL_SRC_FILES := \ src/WVUUID.cpp LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport \ frameworks/av/include \ frameworks/native/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ @@ -104,12 +98,13 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libstlport \ libutils \ libstagefright_foundation \ LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos +LOCAL_CXX_STL := stlport + LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers) LOCAL_MODULE := libwvdrmengine diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk index 9173c67c..b0cdeb17 100644 --- a/libwvdrmengine/cdm/Android.mk +++ b/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) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index 204f18db..92adb605 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/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) diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index af594569..11ccb613 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -5,8 +5,6 @@ LOCAL_SRC_FILES := \ src/WVCryptoPlugin.cpp \ LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport \ external/openssl/include \ frameworks/av/include \ frameworks/native/include \ @@ -22,4 +20,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index f9d2fe28..aed97a3c 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -5,9 +5,7 @@ LOCAL_SRC_FILES := \ WVCryptoPlugin_test.cpp \ LOCAL_C_INCLUDES := \ - bionic \ external/gtest/include \ - external/stlport/stlport \ frameworks/av/include \ frameworks/native/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ @@ -22,7 +20,7 @@ LOCAL_STATIC_LIBRARIES := \ libcdm_utils \ libgmock \ libgmock_main \ - libgtest \ + libgtest_ndk \ libwvlevel3 \ libprotobuf-cpp-2.3.0-lite \ libwvdrmcryptoplugin \ @@ -33,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libstagefright_foundation \ - libstlport \ libutils \ # Needed to use gMock 1.7.0 on Android @@ -61,4 +58,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index 7935cf7b..f42d9e05 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -6,8 +6,6 @@ LOCAL_SRC_FILES := \ src/WVGenericCryptoInterface.cpp \ LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport \ frameworks/av/include \ frameworks/native/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ @@ -22,4 +20,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 0c860b16..35ee998f 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -5,9 +5,7 @@ LOCAL_SRC_FILES := \ WVDrmPlugin_test.cpp \ LOCAL_C_INCLUDES := \ - bionic \ external/gtest/include \ - external/stlport/stlport \ frameworks/av/include \ frameworks/native/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ @@ -23,7 +21,7 @@ LOCAL_STATIC_LIBRARIES := \ libcdm_utils \ libgmock \ libgmock_main \ - libgtest \ + libgtest_ndk \ libwvlevel3 \ libprotobuf-cpp-2.3.0-lite \ libwvdrmdrmplugin \ @@ -33,7 +31,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libstlport \ libutils \ # Needed to use gMock 1.7.0 on Android @@ -61,4 +58,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libwvdrmengine/oemcrypto/mock/Android.mk index 08b0a56f..0aabbc04 100644 --- a/libwvdrmengine/oemcrypto/mock/Android.mk +++ b/libwvdrmengine/oemcrypto/mock/Android.mk @@ -17,18 +17,15 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/src \ vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/third_party/stringencoders/src \ - bionic \ external/gtest/include \ external/openssl/include \ external/openssl/include/openssl \ - external/stlport/stlport \ LOCAL_SHARED_LIBRARIES := \ libcrypto \ libcutils \ libdl \ liblog \ - libstlport \ libutils \ libz \ @@ -37,8 +34,8 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) LOCAL_MODULE := liboemcrypto - LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport include $(BUILD_SHARED_LIBRARY) diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index a385231f..f6efc65b 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -9,10 +9,8 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := tests LOCAL_C_INCLUDES += \ - bionic \ external/gtest/include \ external/openssl/include \ - external/stlport/stlport \ $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../mock/src \ vendor/widevine/libwvdrmengine/cdm/core/include \ @@ -21,8 +19,8 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_utils \ - libgtest \ - libgtest_main \ + libgtest_ndk \ + libgtest_main_ndk \ libwvlevel3 \ libcdm_utils \ @@ -31,7 +29,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ liblog \ - libstlport \ libutils \ libz \ @@ -39,4 +36,6 @@ LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE) diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 6bbd55b1..9aeee205 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -7,9 +7,7 @@ LOCAL_SRC_FILES := \ WVDrmFactory_test.cpp \ LOCAL_C_INCLUDES := \ - bionic \ external/gtest/include \ - external/stlport/stlport \ frameworks/av/include \ frameworks/native/include \ vendor/widevine/libwvdrmengine/include \ @@ -17,8 +15,8 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ - libgtest \ - libgtest_main \ + libgtest_ndk \ + libgtest_main_ndk \ LOCAL_SHARED_LIBRARIES := \ libcrypto \ @@ -34,4 +32,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TARGET_ARCH := arm mips x86 +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE) diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk index c0c39d65..5c95ece8 100644 --- a/proprietary/drmwvmplugin/Android.mk +++ b/proprietary/drmwvmplugin/Android.mk @@ -43,6 +43,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) +LOCAL_CXX_STL := stlport include $(BUILD_STATIC_LIBRARY) # invoke Android.mk files in subdirs diff --git a/proprietary/drmwvmplugin/common.mk b/proprietary/drmwvmplugin/common.mk index 1dd825c5..b2edb6d9 100644 --- a/proprietary/drmwvmplugin/common.mk +++ b/proprietary/drmwvmplugin/common.mk @@ -1,7 +1,4 @@ LOCAL_C_INCLUDES:= \ - $(TOP)/bionic \ - $(TOP)/bionic/libstdc++/include \ - $(TOP)/external/stlport/stlport \ $(TOP)/vendor/widevine/proprietary/streamcontrol/include \ $(TOP)/vendor/widevine/proprietary/drmwvmplugin/include \ $(TOP)/frameworks/av/drm/libdrmframework/include \ diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk index 9405f86e..05ec5da5 100644 --- a/proprietary/drmwvmplugin/test/Android.mk +++ b/proprietary/drmwvmplugin/test/Android.mk @@ -6,18 +6,15 @@ LOCAL_SRC_FILES:= \ ../src/WVMLogging.cpp LOCAL_C_INCLUDES+= \ - bionic \ vendor/widevine/proprietary/include \ vendor/widevine/proprietary/drmwvmplugin/include \ vendor/widevine/proprietary/streamcontrol/include \ - external/stlport/stlport \ frameworks/av/drm/libdrmframework/include \ frameworks/av/drm/libdrmframework/plugins/common/include LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86 LOCAL_SHARED_LIBRARIES := \ - libstlport \ liblog \ libutils \ libz \ @@ -32,4 +29,5 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) +LOCAL_CXX_STL := stlport include $(BUILD_EXECUTABLE) diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk index 857c3df5..68cb4ab0 100644 --- a/proprietary/streamcontrol/test/Android.mk +++ b/proprietary/streamcontrol/test/Android.mk @@ -8,9 +8,7 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE_TAGS := tests LOCAL_C_INCLUDES += \ - bionic \ vendor/widevine/proprietary/include \ - external/stlport/stlport \ vendor/widevine/proprietary/streamcontrol/include \ vendor/widevine/proprietary/drmwvmplugin/include \ frameworks/av/drm/libdrmframework/include \ @@ -19,7 +17,6 @@ LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86 LOCAL_SHARED_LIBRARIES := \ - libstlport \ libdrmframework \ liblog \ libutils \ @@ -34,4 +31,6 @@ LOCAL_MODULE:=test-wvplayer_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MULTILIB := 32 +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE) diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk index c3e20319..1fbc7a6b 100644 --- a/proprietary/wvm/Android.mk +++ b/proprietary/wvm/Android.mk @@ -22,4 +22,5 @@ LOCAL_MODULE := libwvmcommon LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) LOCAL_MULTILIB := 32 +LOCAL_CXX_STL := stlport include $(BUILD_STATIC_LIBRARY) diff --git a/proprietary/wvm/common.mk b/proprietary/wvm/common.mk index c1dba28c..8c61622a 100644 --- a/proprietary/wvm/common.mk +++ b/proprietary/wvm/common.mk @@ -1,7 +1,4 @@ LOCAL_C_INCLUDES:= \ - bionic \ - bionic/libstdc++ \ - external/stlport/stlport \ frameworks/av/media/libstagefright/include \ vendor/widevine/proprietary/streamcontrol/include \ vendor/widevine/proprietary/wvm/include diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk index bae1bf2e..c55b3cc7 100644 --- a/proprietary/wvm/test/Android.mk +++ b/proprietary/wvm/test/Android.mk @@ -6,15 +6,12 @@ LOCAL_SRC_FILES:= \ Testlibwvm.cpp LOCAL_C_INCLUDES+= \ - bionic \ vendor/widevine/proprietary/include \ - external/stlport/stlport \ frameworks/av/media/libstagefright LOCAL_C_INCLUDES_x86 += $(TOP)/system/core/include/arch/linux-x86 LOCAL_SHARED_LIBRARIES := \ - libstlport \ libdrmframework \ libstagefright \ liblog \ @@ -28,4 +25,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TARGET_ARCH := $(WIDEVINE_SUPPORTED_ARCH) +LOCAL_CXX_STL := stlport + include $(BUILD_EXECUTABLE)