Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36edb202 authored Sep 12, 2010 by Jean-Baptiste Queru Committed by Android Code Review Sep 12, 2010

Merge "Make DRM libraries optional"

parents 89e05fd5 3802949f

drm/common/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \

		LOCAL_MODULE:= libdrmframeworkcommon

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_STATIC_LIBRARY)

drm/drmioserver/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,4 +38,6 @@ LOCAL_C_INCLUDES := \

		LOCAL_MODULE:= drmioserver

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_EXECUTABLE)

drm/drmserver/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,4 +41,6 @@ LOCAL_C_INCLUDES := \

		LOCAL_MODULE:= drmserver

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_EXECUTABLE)

drm/jni/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,5 +44,7 @@ LOCAL_C_INCLUDES += \

		LOCAL_PRELINK_MODULE := false

		LOCAL_MODULE_TAGS := optional

		include $(BUILD_SHARED_LIBRARY)

drm/libdrmframework/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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))