diff options
| author | Jim Miller <jaggies@google.com> | 2012-08-03 17:11:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-03 17:11:54 -0700 |
| commit | 2b127470a41b683f49b0b2f1a5c3ac7e0af53e28 (patch) | |
| tree | 961bdd0860db07ef2f26025527d144c979c93cc2 | |
| parent | 632a608d94a1c42cd5dd1b36e88b162d8e11ca9a (diff) | |
| parent | f040963b43cd68083536cb514ea030c670b504b0 (diff) | |
| download | omap4xxx-2b127470a41b683f49b0b2f1a5c3ac7e0af53e28.tar.gz | |
Merge "Fix the build." into jb-mr1-dev
| -rw-r--r-- | libdrmdecrypt/Android.mk | 32 | ||||
| -rw-r--r-- | omap4.mk | 3 |
2 files changed, 1 insertions, 34 deletions
diff --git a/libdrmdecrypt/Android.mk b/libdrmdecrypt/Android.mk deleted file mode 100644 index 324221c..0000000 --- a/libdrmdecrypt/Android.mk +++ /dev/null @@ -1,32 +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 \ - -ifeq ($(BOARD_USES_SECURE_SERVICES),true) -LOCAL_STATIC_LIBRARIES += \ - libtee_client_api_driver \ - -endif - -LOCAL_SHARED_LIBRARIES := \ - libstagefright_foundation \ - liblog \ - libcutils \ - libcrypto - -LOCAL_MODULE := libdrmdecrypt - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) - -endif @@ -24,9 +24,8 @@ PRODUCT_PACKAGES := \ libOMX.TI.DUCATI1.VIDEO.DECODER.secure \ libOMX.TI.DUCATI1.VIDEO.CAMERA \ libOMX.TI.DUCATI1.MISC.SAMPLE \ - libdrmdecrypt \ libstagefrighthw \ - libI420colorconvert \ + libI420colorconvert \ libtiutils \ libcamera \ libion_ti \ |