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

Snap for 4625912 from 328cdd0e3a to pi-release

Browse Source 
am: f593b40166

Change-Id: If95e22636b6f720baf537c3f0cd045fc9729fa0a
This commit is contained in:
android-build-team Robot
2018-02-28 08:48:45 +00:00
committed by android-build-merger
parent aeb1fc8ed6 f593b40166
commit 79c866ff7c
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libwvdrmengine/Android.mk
View File

@@ -4,11 +4,29 @@
LOCAL_PATH := $(call my-dir)
# -----------------------------------------------------------------------------
# Copies move script to /system/bin.
# The mv command preserves SELinux labels(i.e. media_data_file).
# We need to run restorecon to put the correct context after the move.
# However, restorecon is not implemented for /vendor/bin, so we put
# the script in /system/bin.
# Copies move script to /system/bin.
#
# The move script is only needed for existing devices that
# are running Widevine DRM and are upgrading to Pi or later
# Android releases. New devices release with Pi and future
# Android releases do not need to run this script.
#
# To run this script, vendor must add the dependency to the
# corresponding device.mk file and build from ANDROID_ROOT.
#
# For example:
# PRODUCT_PACKAGES += \
# android.hardware.drm@1.0-impl \
# android.hardware.drm@1.0-service \
# android.hardware.drm@1.0-service.widevine \
# move_widevine_data.sh
#
# In addition, vendor needs to update device SELinux policy.
#
# The mv command preserves SELinux labels(i.e. media_data_file).
# We need to run restorecon to put the correct context after the move.
# However, restorecon is not implemented for /vendor/bin, so we put
# the script in /system/bin.
#
include $(CLEAR_VARS)
@@ -48,7 +66,6 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_MODULE := android.hardware.drm@1.0-service.widevine
LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
LOCAL_REQUIRED_MODULES := move_widevine_data.sh
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_OWNER := widevine

1
libwvdrmengine/test/castv2/Android.mk
View File

@@ -13,6 +13,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := com.android.mediadrm.signer org.apache.http.legacy
LOCAL_PACKAGE_NAME := CastSignAPITest
LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)

3
libwvdrmengine/test/java/Android.mk
View File

@@ -14,8 +14,7 @@ LOCAL_DEX_PREOPT := false
# When built, explicitly put it in the data/app partition.
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
# TODO: This test app depends on framework implementation details.
# LOCAL_SDK_VERSION := current
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)