summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--libdrmdecrypt/Android.mk33
-rw-r--r--omap4.mk4
-rw-r--r--sgx/Android.mk78
-rwxr-xr-xsgx/bin/pvrsrvctlbin18674 -> 0 bytes
-rw-r--r--sgx/lib/egl/libEGL_POWERVR_SGX540_120.sobin15326 -> 0 bytes
-rw-r--r--sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.sobin2408857 -> 0 bytes
-rw-r--r--sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.sobin2154368 -> 0 bytes
-rw-r--r--sgx/lib/hw/gralloc.omap4.sobin169968 -> 0 bytes
-rw-r--r--sgx/lib/libIMGegl.sobin393883 -> 0 bytes
-rw-r--r--sgx/lib/libPVRScopeServices.sobin34162 -> 0 bytes
-rw-r--r--sgx/lib/libglslcompiler.sobin826274 -> 0 bytes
-rw-r--r--sgx/lib/libpvr2d.sobin131441 -> 0 bytes
-rw-r--r--sgx/lib/libpvrANDROID_WSEGL.sobin47838 -> 0 bytes
-rw-r--r--sgx/lib/libsrv_init.sobin161836 -> 0 bytes
-rw-r--r--sgx/lib/libsrv_um.sobin674359 -> 0 bytes
-rw-r--r--sgx/lib/libusc.sobin3774749 -> 0 bytes
-rwxr-xr-xsgx/updatelibs.sh5
18 files changed, 2 insertions, 120 deletions
diff --git a/Android.mk b/Android.mk
index 6147175..ec152e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
ifeq ($(TARGET_BOARD_PLATFORM),omap4)
-ifeq ($(TARGET_BOARD_PLATFORM_VARIANT),aah)
+ifeq ($(TARGET_BOARD_PLATFORM_VARIANT),omap4-aah)
LOCAL_PATH:= $(call my-dir)
HARDWARE_TI_OMAP4_BASE:= $(LOCAL_PATH)
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk
deleted file mode 100644
index 02138c7..0000000
--- a/libdrmdecrypt/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-ifeq ($(TARGET_BOARD_PLATFORM),omap4)
-ifeq ($(TARGET_BOARD_PLATFORM_VARIANT),aah)
-ifeq ($(BOARD_USES_SECURE_SERVICES),true)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
--include $(TOP)/vendor/widevine/proprietary/cryptoPlugin/decrypt-core.mk
-
-LOCAL_C_INCLUDES:= \
- $(TOP)/frameworks/native/include/media/hardware \
- $(TOP)/vendor/widevine/proprietary/cryptoPlugin \
-
-LOCAL_STATIC_LIBRARIES += \
- libtee_client_api_driver \
-
-LOCAL_SHARED_LIBRARIES := \
- libstagefright_foundation \
- liblog \
- libcutils \
- libcrypto
-
-LOCAL_MODULE_OWNER := ti
-
-LOCAL_MODULE := libdrmdecrypt
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif # ifeq ($(BOARD_USES_SECURE_SERVICES),true)
-endif # ifeq ($(strip $(TARGET_BOARD_PLATFORM_VARIANT)),)
-endif # ifeq ($(TARGET_BOARD_PLATFORM),omap4)
diff --git a/omap4.mk b/omap4.mk
index ec31e36..8bef517 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -34,8 +34,6 @@ PRODUCT_PACKAGES := \
hwcomposer.omap4 \
smc_pa_ctrl \
tf_daemon \
- libtf_crypto_sst \
- ti_omap4_sgx_libs \
- libdrmdecrypt
+ libtf_crypto_sst
PRODUCT_VENDOR_KERNEL_HEADERS := hardware/ti/omap4xxx/kernel-headers
diff --git a/sgx/Android.mk b/sgx/Android.mk
deleted file mode 100644
index 8bde0ff..0000000
--- a/sgx/Android.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-ifeq ($(TARGET_BOARD_PLATFORM),omap4)
-ifeq ($(TARGET_BOARD_PLATFORM_VARIANT),aah)
-
-LOCAL_PATH := $(call my-dir)
-
-define _add-sgx-vendor-lib
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_MODULE_OWNER := imgtec
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $$(TARGET_OUT)$(abspath /vendor/$(dir $1))
-LOCAL_STRIP_MODULE := true
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $$(BUILD_PREBUILT)
-endef
-
-define _add-sgx-vendor-bin
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_MODULE_OWNER := imgtec
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $$(TARGET_OUT)$(abspath /vendor/$(dir $1))
-LOCAL_STRIP_MODULE := true
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_EXECUTABLES)
-include $$(BUILD_PREBUILT)
-endef
-
-
-prebuilt_sgx_vendor_libs := \
- lib/libIMGegl.so \
- lib/libglslcompiler.so \
- lib/libusc.so \
- lib/libPVRScopeServices.so \
- lib/libsrv_um.so \
- lib/hw/gralloc.omap4.so \
- lib/libpvrANDROID_WSEGL.so \
- lib/libpvr2d.so \
- lib/libsrv_init.so \
- lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
- lib/egl/libGLESv2_POWERVR_SGX540_120.so \
- lib/egl/libEGL_POWERVR_SGX540_120.so
-
-prebuilt_sgx_vendor_bins := \
- bin/pvrsrvctl
-
-prebuilt_sgx_modules := \
- $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins),\
- $(notdir $(basename $(_file))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ti_omap4_sgx_libs
-LOCAL_MODULE_OWNER := ti
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(prebuilt_sgx_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-$(foreach _file,$(prebuilt_sgx_vendor_libs),\
- $(eval $(call _add-sgx-vendor-lib,$(_file))))
-
-$(foreach _file,$(prebuilt_sgx_vendor_bins),\
- $(eval $(call _add-sgx-vendor-bin,$(_file))))
-
-prebuilt_sgx_modules :=
-prebuilt_sgx_vendor_libs :=
-prebuilt_sgx_vendor_bins :=
-_add-sgx-vendor-lib :=
-_add-sgx-vendor-bin :=
-
-endif # ifeq ($(TARGET_BOARD_PLATFORM),omap4)
-endif # ifeq ($(TARGET_BOARD_PLATFORM_VARIANT),aah)
diff --git a/sgx/bin/pvrsrvctl b/sgx/bin/pvrsrvctl
deleted file mode 100755
index 02afdc5..0000000
--- a/sgx/bin/pvrsrvctl
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so b/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so
deleted file mode 100644
index b499093..0000000
--- a/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so b/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so
deleted file mode 100644
index 9121aff..0000000
--- a/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so b/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so
deleted file mode 100644
index c3d4ce0..0000000
--- a/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/hw/gralloc.omap4.so b/sgx/lib/hw/gralloc.omap4.so
deleted file mode 100644
index 3ba1391..0000000
--- a/sgx/lib/hw/gralloc.omap4.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libIMGegl.so b/sgx/lib/libIMGegl.so
deleted file mode 100644
index f803a6e..0000000
--- a/sgx/lib/libIMGegl.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libPVRScopeServices.so b/sgx/lib/libPVRScopeServices.so
deleted file mode 100644
index 3a2ce36..0000000
--- a/sgx/lib/libPVRScopeServices.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libglslcompiler.so b/sgx/lib/libglslcompiler.so
deleted file mode 100644
index 5402024..0000000
--- a/sgx/lib/libglslcompiler.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libpvr2d.so b/sgx/lib/libpvr2d.so
deleted file mode 100644
index 1c76f11..0000000
--- a/sgx/lib/libpvr2d.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libpvrANDROID_WSEGL.so b/sgx/lib/libpvrANDROID_WSEGL.so
deleted file mode 100644
index 9108dde..0000000
--- a/sgx/lib/libpvrANDROID_WSEGL.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libsrv_init.so b/sgx/lib/libsrv_init.so
deleted file mode 100644
index 9e2997e..0000000
--- a/sgx/lib/libsrv_init.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libsrv_um.so b/sgx/lib/libsrv_um.so
deleted file mode 100644
index 4135473..0000000
--- a/sgx/lib/libsrv_um.so
+++ /dev/null
Binary files differ
diff --git a/sgx/lib/libusc.so b/sgx/lib/libusc.so
deleted file mode 100644
index d6e3233..0000000
--- a/sgx/lib/libusc.so
+++ /dev/null
Binary files differ
diff --git a/sgx/updatelibs.sh b/sgx/updatelibs.sh
deleted file mode 100755
index 7a4b927..0000000
--- a/sgx/updatelibs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-for a in `find bin lib -type f`; do
-cp ${ANDROID_PRODUCT_OUT}/target/`basename $a` $a
-done