From 4105187ae3ba28a5ee9e55dd52ba3596820f2fbd Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Tue, 31 Dec 2013 19:21:31 +0100 Subject: Get rid of HDCP keys Signed-off-by: Paul Kocialkowski --- Android.mk | 24 ------------------------ BoardConfig.mk | 2 -- device.mk | 3 --- init.tuna.rc | 3 --- 4 files changed, 32 deletions(-) diff --git a/Android.mk b/Android.mk index 0e3f37d..a4f88ae 100644 --- a/Android.mk +++ b/Android.mk @@ -22,28 +22,4 @@ LOCAL_PATH := $(call my-dir) -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 diff --git a/BoardConfig.mk b/BoardConfig.mk index 717c975..ade6ca6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -47,8 +47,6 @@ TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 TARGET_BOOTLOADER_BOARD_NAME := tuna -BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true - #BOARD_USES_HGL := true #BOARD_USES_OVERLAY := true USE_OPENGL_RENDERER := false diff --git a/device.mk b/device.mk index d890a38..df0ca82 100644 --- a/device.mk +++ b/device.mk @@ -53,9 +53,6 @@ PRODUCT_COPY_FILES += \ device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf \ device/samsung/tuna/audio_effects.conf:system/vendor/etc/audio_effects.conf -PRODUCT_PACKAGES += \ - tuna_hdcp_keys - #PRODUCT_PACKAGES += \ # keystore.tuna diff --git a/init.tuna.rc b/init.tuna.rc index 205bf43..ca2876d 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -84,9 +84,6 @@ on fs chown radio radio /factory chmod 0775 /factory -# add symlink for HDCP key - symlink /factory/hdcp.keys /system/vendor/firmware/hdcp.keys - # allow to modify Wifi power behaviour in terms of battery/speed at sleep time chown root system sys/module/bcmdhd/parameters/uiFastWifi -- cgit v1.1