widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove BoringSSL static targets in widevine."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-18 23:55:26 +00:00
committed by Android (Google) Code Review
parent 6cdf6d5a95 02fb7421b9
commit 24a9ce769e
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/Android.mk
View File

@@ -49,7 +49,7 @@ LOCAL_MODULE := libcdm_utils
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
LOCAL_STATIC_LIBRARIES := libcrypto_static LOCAL_STATIC_LIBRARIES := libcrypto
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \
@@ -160,7 +160,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libwvdrmcryptoplugin \ libwvdrmcryptoplugin \
libwvdrmdrmplugin \ libwvdrmdrmplugin \
@@ -220,7 +220,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libwvdrmcryptoplugin_hidl \ libwvdrmcryptoplugin_hidl \
libwvdrmdrmplugin_hidl \ libwvdrmdrmplugin_hidl \

2
libwvdrmengine/cdm/Android.mk
View File

@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES += \
LOCAL_HEADER_LIBRARIES := \ LOCAL_HEADER_LIBRARIES := \
libutils_headers libutils_headers
LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto
SRC_DIR := src SRC_DIR := src
CORE_SRC_DIR := core/src CORE_SRC_DIR := core/src

4
libwvdrmengine/mediacrypto/Android.mk
View File

@@ -23,7 +23,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm_protos \ libcdm_protos \
libcrypto_static \ libcrypto \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
liblog liblog
@@ -60,7 +60,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm_protos \ libcdm_protos \
libcrypto_static \ libcrypto \
libwidevinehidl_utils \ libwidevinehidl_utils \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -21,7 +21,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libgmock \ libgmock \
libgmock_main \ libgmock_main \
@@ -78,7 +78,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libgmock \ libgmock \
libgmock_main \ libgmock_main \

2
libwvdrmengine/mediadrm/Android.mk
View File

@@ -61,7 +61,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm_protos \ libcdm_protos \
libcrypto_static libcrypto
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.0 \ android.hardware.drm@1.0 \

4
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -22,7 +22,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libgmock \ libgmock \
libgmock_main \ libgmock_main \
@@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
libjsmn \ libjsmn \
libgmock \ libgmock \
libgmock_main \ libgmock_main \

2
libwvdrmengine/oemcrypto/mock/Android.mk
View File

@@ -39,7 +39,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm_utils \ libcdm_utils \
libcrypto_static \ libcrypto \
# Proprietary modules are put in vendor/lib instead of /system/lib. # Proprietary modules are put in vendor/lib instead of /system/lib.
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true

4
libwvdrmengine/test/unit/Android.mk
View File

@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcrypto_static \ libcrypto \
libgtest \ libgtest \
libgtest_main \ libgtest_main \
@@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcrypto_static \ libcrypto \
libgtest \ libgtest \
libgtest_main \ libgtest_main \

2
libwvdrmengine/vts/vendor_module/Android.mk
View File

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES := \
libgtest \ libgtest \
libcdm \ libcdm \
libcdm_utils \ libcdm_utils \
libcrypto_static libcrypto
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \