From 29f022b6822ff29e209df88251da6c7b09ae8c4e Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Wed, 10 May 2017 23:16:46 +0200 Subject: Get rid of HDCP keys Adapted from Paul's commit for Replicant 4.2: commit 4105187ae3ba28a5ee9e55dd52ba3596820f2fbd Author: Paul Kocialkowski Date: Tue Dec 31 19:21:31 2013 +0100 Get rid of HDCP keys Signed-off-by: Paul Kocialkowski Signed-off-by: Wolfgang Wiedmeyer --- Android.mk | 24 ------------------------ BoardConfig.mk | 3 --- device.mk | 3 --- rootdir/init.tuna.rc | 3 --- 4 files changed, 33 deletions(-) diff --git a/Android.mk b/Android.mk index 035fc1c..e48fcd9 100755 --- a/Android.mk +++ b/Android.mk @@ -24,30 +24,6 @@ LOCAL_PATH := $(call my-dir) ifneq ($(filter maguro toro toroplus,$(TARGET_DEVICE)),) -ifeq ($(BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK), true) -include $(CLEAR_VARS) - -LOCAL_MODULE := tuna_hdcp_keys -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_SUFFIX := -timestamp - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): HDCP_KEYS_FILE := /factory/hdcp.keys -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/firmware/hdcp.keys -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/Android.mk -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(HDCP_KEYS_FILE)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(HDCP_KEYS_FILE) $(SYMLINK) - $(hide) touch $@ - include $(call all-makefiles-under,$(LOCAL_PATH)) endif - -endif \ No newline at end of file diff --git a/BoardConfig.mk b/BoardConfig.mk index d0372e8..c841537 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -52,9 +52,6 @@ DOMX_TUNA := true COMMON_GLOBAL_CFLAGS += -DDOMX_TUNA TI_CAMERAHAL_MAX_CAMERAS_SUPPORTED := 2 -# Include HDCP keys -BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true - USE_OPENGL_RENDERER := false # enable llvmpipe BOARD_GPU_DRIVERS := swrast diff --git a/device.mk b/device.mk index 9b65341..30d2313 100755 --- a/device.mk +++ b/device.mk @@ -52,9 +52,6 @@ PRODUCT_COPY_FILES += \ $(DEVICE_FOLDER)/audio/audio_policy.conf:system/etc/audio_policy.conf \ $(DEVICE_FOLDER)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf -PRODUCT_PACKAGES += \ - tuna_hdcp_keys - # Enable AAC 5.1 output PRODUCT_PROPERTY_OVERRIDES += \ media.aac_51_output_enabled=true diff --git a/rootdir/init.tuna.rc b/rootdir/init.tuna.rc index 1e8d5b9..c3299e4 100755 --- a/rootdir/init.tuna.rc +++ b/rootdir/init.tuna.rc @@ -73,9 +73,6 @@ on fs chmod 0660 /dev/i2c-2 chown media media /dev/i2c-2 - # add symlink for HDCP key - symlink /factory/hdcp.keys /system/vendor/firmware/hdcp.keys - # nfc setprop ro.nfc.port "COM4" chmod 0600 /dev/ttyO3 -- cgit v1.1