summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon2014-11-11 18:04:26 -0600
committerNishanth Menon2014-11-11 18:04:26 -0600
commita2b194e5a56a491e9c74fdd4cc930b2a084665e8 (patch)
tree88bd739a6995ac0820346c319aca464485fb3b2f
parenteeec7b5ca43758c207975b5e3a67b26694076b9f (diff)
downloaddevice-ti-x15-a2b194e5a56a491e9c74fdd4cc930b2a084665e8.tar.gz
device-ti-x15-a2b194e5a56a491e9c74fdd4cc930b2a084665e8.tar.xz
device-ti-x15-a2b194e5a56a491e9c74fdd4cc930b2a084665e8.zip
remove hdcp
Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--Android.mk55
-rw-r--r--init.beaglex15board.rc3
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml1
3 files changed, 0 insertions, 59 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 0df5349..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
1#
2# Copyright (C) 2011 The Android Open-Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# WARNING: Everything listed here will be built on ALL platforms,
18# including x86, the emulator, and the SDK. Modules must be uniquely
19# named (liblights.panda), and must build everywhere, or limit themselves
20# to only building on ARM if they include assembly. Individual makefiles
21# are responsible for having their own logic, for fine-grained control.
22
23LOCAL_PATH := $(call my-dir)
24
25# protect makefile from other boards
26# if some modules are built directly from this directory (not subdirectories),
27# their rules should be written here.
28ifeq ($(TARGET_DEVICE),beaglex15)
29include $(CLEAR_VARS)
30
31LOCAL_MODULE := beaglex15_hdcp_keys
32LOCAL_MODULE_TAGS := optional
33LOCAL_MODULE_CLASS := FAKE
34LOCAL_MODULE_SUFFIX := -timestamp
35
36include $(BUILD_SYSTEM)/base_rules.mk
37
38$(LOCAL_BUILT_MODULE): HDCP_KEYS_FILE := /factory/hdcp.keys
39$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/firmware/hdcp.keys
40$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/Android.mk
41$(LOCAL_BUILT_MODULE):
42 $(hide) echo "Symlink: $(SYMLINK) -> $(HDCP_KEYS_FILE)"
43 $(hide) mkdir -p $(dir $@)
44 $(hide) mkdir -p $(dir $(SYMLINK))
45 $(hide) rm -rf $@
46 $(hide) rm -rf $(SYMLINK)
47 $(hide) ln -sf $(HDCP_KEYS_FILE) $(SYMLINK)
48 $(hide) touch $@
49
50# if some modules are built directly from this directory (not subdirectories),
51# their rules should be written here.
52
53include $(call all-makefiles-under,$(LOCAL_PATH))
54
55endif
diff --git a/init.beaglex15board.rc b/init.beaglex15board.rc
index d4f7b3d..f16e2e6 100644
--- a/init.beaglex15board.rc
+++ b/init.beaglex15board.rc
@@ -88,9 +88,6 @@ on fs
88# Change permissions on the governor (this is for debug only) 88# Change permissions on the governor (this is for debug only)
89 chmod 444 /proc/cmdline 89 chmod 444 /proc/cmdline
90 90
91# add symlink for HDCP key
92 symlink /factory/hdcp.keys /system/vendor/firmware/hdcp.keys
93
94service pvrsrvinit /vendor/bin/pvrsrvinit 91service pvrsrvinit /vendor/bin/pvrsrvinit
95 class core 92 class core
96 user root 93 user root
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 009fd1f..4b2bab1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -97,7 +97,6 @@
97 remote submix module. This module is used to record and stream system 97 remote submix module. This module is used to record and stream system
98 audio output to the WiFi display encoder in the media server. 98 audio output to the WiFi display encoder in the media server.
99 * The remote submix module "audio.r_submix.default" must be installed on the device. 99 * The remote submix module "audio.r_submix.default" must be installed on the device.
100 * The device must be provisioned with HDCP keys (for protected content).
101 --> 100 -->
102 <bool name="config_enableWifiDisplay">true</bool> 101 <bool name="config_enableWifiDisplay">true</bool>
103 102