diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-12 08:59:29 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 08:59:29 -0700 |
commit | 5441abc147d97f722d35fe71e7fbf41ce48a4944 (patch) | |
tree | bfee5d8b247e3b80d0bbdad5fbeda7933622b8ea | |
parent | 9783ed8f85af3d7c72030098acfed7e1d6638349 (diff) | |
parent | f31edf5d3b62f64f7395e61650b3011d21d0e6c0 (diff) | |
download | frameworks_av-5441abc147d97f722d35fe71e7fbf41ce48a4944.zip frameworks_av-5441abc147d97f722d35fe71e7fbf41ce48a4944.tar.gz frameworks_av-5441abc147d97f722d35fe71e7fbf41ce48a4944.tar.bz2 |
am ec06144c: am 36edb202: Merge "Make DRM libraries optional"
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'
* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
Make DRM libraries optional
-rw-r--r-- | drm/common/Android.mk | 2 | ||||
-rw-r--r-- | drm/drmserver/Android.mk | 2 | ||||
-rw-r--r-- | drm/libdrmframework/Android.mk | 2 | ||||
-rw-r--r-- | drm/libdrmframework/plugins/passthru/Android.mk | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/drm/common/Android.mk b/drm/common/Android.mk index 249fe8e..808b2c2 100644 --- a/drm/common/Android.mk +++ b/drm/common/Android.mk @@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= libdrmframeworkcommon +LOCAL_MODULE_TAGS := optional + include $(BUILD_STATIC_LIBRARY) diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index 46a51bc..5df2ff8 100644 --- a/drm/drmserver/Android.mk +++ b/drm/drmserver/Android.mk @@ -41,4 +41,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= drmserver +LOCAL_MODULE_TAGS := optional + include $(BUILD_EXECUTABLE) diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index 765adba..99133ba 100644 --- a/drm/libdrmframework/Android.mk +++ b/drm/libdrmframework/Android.mk @@ -42,6 +42,8 @@ LOCAL_C_INCLUDES += \ LOCAL_PRELINK_MODULE := false +LOCAL_MODULE_TAGS := optional + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/drm/libdrmframework/plugins/passthru/Android.mk b/drm/libdrmframework/plugins/passthru/Android.mk index 169b89b..7856d37 100644 --- a/drm/libdrmframework/plugins/passthru/Android.mk +++ b/drm/libdrmframework/plugins/passthru/Android.mk @@ -43,7 +43,6 @@ LOCAL_C_INCLUDES += \ # Set the following flag to enable the decryption passthru flow #LOCAL_CFLAGS += -DENABLE_PASSTHRU_DECRYPTION -PRODUCT_COPY_FILES += \ - $(TARGET_OUT_SHARED_LIBRARIES)/libdrmpassthruplugin.so:system/lib/drm/plugins/native/libdrmpassthruplugin.so +LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) |