Merge pull request #1 from ethantseng/bug-1003711-part2

Bug 1003711 - Part 2: Build Darwin Streaming Server on B2G emulator. r=vicamo

Android.mk

@@ -65,7 +65,7 @@ endef
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := DarwinStreamingServer
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_C_INCLUDES := \
   $(addprefix $(DARWIN_TOPSRCDIR)/, \
@@ -234,13 +234,20 @@ samples := \
   sample_h264_300kbit.mp4 \
   $(empty)
 
-$(call darwin-add-prebilt-files-to-module-path, \
-  $(foreach s,$(samples),$(s):$(s)), \
-  $(DARWIN_INSTALLED_MEDIA_DIR), \
-  DATA, \
-  samples \
-)
+include $(call first-makefiles-under,$(LOCAL_PATH))
 
-$(call darwin-add-to-targets,$(samples),sample)
+include $(CLEAR_VARS)
+LOCAL_MODULE       := streamingserver.xml
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := streamingserver.xml-ANDROID
+LOCAL_MODULE_PATH  := $(DARWIN_INSTALLED_ETC_DIR)
+include $(BUILD_PREBUILT)
 
-include $(call first-makefiles-under,$(LOCAL_PATH))
+include $(CLEAR_VARS)
+LOCAL_MODULE       := sample_h264_100kbit.mp4
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := DATA
+LOCAL_SRC_FILES    := $(LOCAL_MODULE)
+LOCAL_MODULE_PATH  := $(DARWIN_INSTALLED_MEDIA_DIR)
+include $(BUILD_PREBUILT)

defaultPaths.h

@@ -58,11 +58,11 @@
 
 # define DEFAULTPATHS_DIRECTORY_SEPARATOR	"/"
 
-# define DEFAULTPATHS_ETC_DIR			"/system/etc/streaming/"
+# define DEFAULTPATHS_ETC_DIR			"/data/misc/streaming/"
 # define DEFAULTPATHS_ETC_DIR_OLD		"/system/etc/"
 # define DEFAULTPATHS_SSM_DIR			"/system/lib/StreamingServerModules/"
 # define DEFAULTPATHS_LOG_DIR			"/data/misc/streaming/logs/"
-# define DEFAULTPATHS_MOVIES_DIR        "/system/media/streaming/"
+# define DEFAULTPATHS_MOVIES_DIR        "/data/misc/streaming/media"
 # define DEFAULTPATHS_PID_DIR           "/data/misc/streaming/"
 
 #else

streamingserver.xml-ANDROID

@@ -121,7 +121,7 @@
 	<PREF NAME="bind_ip_addr">0</PREF>
 
 	<!-- Path to the root folder for movies. -->
-	<PREF NAME="movie_folder">/system/media/streaming</PREF>
+	<PREF NAME="movie_folder">/data/misc/streaming/media</PREF>
 
 	<!-- Maximum amount of bandwidth the server is allowed to serve. -->
 	<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->