diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-12 08:42:48 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-09-12 08:42:48 -0700 |
| commit | 36edb2028acf9f876a288a49a66bc749b28e64c1 (patch) | |
| tree | 61ee46c445ec3492bbd3e358edd62fc05898e8c8 | |
| parent | 89e05fd560e3347070a55260b7aaec3db5647442 (diff) | |
| parent | 3802949f5cfe500b8bc41371ff99c82c9ed5d9c3 (diff) | |
| download | base-36edb2028acf9f876a288a49a66bc749b28e64c1.tar.gz | |
Merge "Make DRM libraries optional"
| -rw-r--r-- | drm/common/Android.mk | 2 | ||||
| -rw-r--r-- | drm/drmioserver/Android.mk | 2 | ||||
| -rw-r--r-- | drm/drmserver/Android.mk | 2 | ||||
| -rw-r--r-- | drm/jni/Android.mk | 2 | ||||
| -rw-r--r-- | drm/libdrmframework/Android.mk | 2 | ||||
| -rw-r--r-- | drm/libdrmframework/plugins/passthru/Android.mk | 3 |
6 files changed, 11 insertions, 2 deletions
diff --git a/drm/common/Android.mk b/drm/common/Android.mk index 249fe8e4026e..808b2c283eff 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/drmioserver/Android.mk b/drm/drmioserver/Android.mk index 32afdd32f5b2..11571c7904bc 100644 --- a/drm/drmioserver/Android.mk +++ b/drm/drmioserver/Android.mk @@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= drmioserver +LOCAL_MODULE_TAGS := optional + include $(BUILD_EXECUTABLE) diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index 46a51bcf926c..5df2ff87c17e 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/jni/Android.mk b/drm/jni/Android.mk index 95ce75af2086..b65e4daafe63 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -44,5 +44,7 @@ LOCAL_C_INCLUDES += \ LOCAL_PRELINK_MODULE := false +LOCAL_MODULE_TAGS := optional + include $(BUILD_SHARED_LIBRARY) diff --git a/drm/libdrmframework/Android.mk b/drm/libdrmframework/Android.mk index 765adba3a474..99133ba28f2f 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 169b89babbf5..7856d3730bad 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) |