diff options
| author | Fred <fredgc@google.com> | 2012-07-17 08:42:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-17 08:42:26 -0700 |
| commit | 741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4 (patch) | |
| tree | 4f16b8a6ad5b2db9b2019fcc81b7c00d9c67d108 | |
| parent | 80fba10a860e6c7900367a6a9dfd9bbbe5ef2cd2 (diff) | |
| parent | 9ca0b752e6b8b091656497c1700f6126a3fdf11b (diff) | |
| download | hardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.zip hardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.tar.gz hardware_ti_omap4xxx-741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4.tar.bz2 | |
Merge "Remove libdrmdecrypt from AOSP build."
| -rw-r--r-- | libdrmdecrypt/Android.mk | 29 | ||||
| -rw-r--r-- | omap4.mk | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk deleted file mode 100644 index 9bb258f..0000000 --- a/libdrmdecrypt/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -ifeq ($(TARGET_BOARD_PLATFORM),omap4) - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -ifneq ($(TARGET_DEVICE),panda) --include $(TOP)/vendor/widevine/proprietary/cryptoPlugin/decrypt-core.mk -endif - -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 := libdrmdecrypt - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) - -endif @@ -24,7 +24,6 @@ PRODUCT_PACKAGES := \ libOMX.TI.DUCATI1.VIDEO.DECODER.secure \ libOMX.TI.DUCATI1.VIDEO.CAMERA \ libOMX.TI.DUCATI1.MISC.SAMPLE \ - libdrmdecrypt \ libstagefrighthw \ libI420colorconvert \ libtiutils \ |