Permit conditional registry of mediaserver extensions
Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 0a0f4db..a485646 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -1,4 +1,13 @@
LOCAL_PATH:= $(call my-dir)
+
+ifneq ($(BOARD_USE_CUSTOM_MEDIASERVEREXTENSIONS),true)
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := register.cpp
+LOCAL_MODULE := libregistermsext
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_STATIC_LIBRARY)
+endif
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -15,6 +24,9 @@
libutils \
libbinder
+LOCAL_STATIC_LIBRARIES := \
+ libregistermsext
+
LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
frameworks/av/services/medialog \