Bug 1003711 - Part 3: Setup config and media file for DarwinStreamingServer; Add dss and dss-setup for init.rc.

Author: ethantseng

darwinstreamingserver/Android.mk

@@ -0,0 +1,24 @@
+# Copyright (C) 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.goldfish.dss.sh
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := $(LOCAL_MODULE)
+LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)
+include $(BUILD_PREBUILT)
+

darwinstreamingserver/init.goldfish.dss.sh

@@ -0,0 +1,10 @@
+#!/system/bin/sh
+
+src_config_fname=/system/etc/streaming/streamingserver.xml
+dst_config_fname=/data/misc/streaming/streamingserver.xml
+
+src_media_fname=/system/media/streaming/sample_h264_100kbit.mp4
+dst_media_fname=/data/misc/streaming/media/sample_h264_100kbit.mp4
+
+cat $src_config_fname > $dst_config_fname
+cat $src_media_fname > $dst_media_fname

etc/init.goldfish.rc.patch

@@ -1,5 +1,5 @@
 diff --git a/rootdir/etc/init.goldfish.rc b/rootdir/etc/init.goldfish.rc
-index 83b7f8a..2864fc6 100644
+index 83b7f8a..ba7753d 100644
 --- a/rootdir/etc/init.goldfish.rc
 +++ b/rootdir/etc/init.goldfish.rc
 @@ -1,23 +1,33 @@
@@ -36,7 +36,7 @@ index 83b7f8a..2864fc6 100644
 
  # disable some daemons the emulator doesn't want
      stop dund
-@@ -25,16 +35,61 @@ on boot
+@@ -25,16 +35,78 @@ on boot
 
  # start essential services
      start qemud
@@ -60,6 +60,11 @@ index 83b7f8a..2864fc6 100644
 +    # Create a writable fake fwpath for emulator. (/sys/module/wlan/parameters/fwpath on device)
 +    write /data/misc/wifi/fake_fwpath sta
 +
++    # Create the directories used by DarwinStreamingServer.
++    mkdir /data/misc/streaming 0770
++    mkdir /data/misc/streaming/logs 0770
++    mkdir /data/misc/streaming/media 0770
++
 +service wpa_supplicant /system/bin/logwrapper /system/bin/wpa_supplicant -Dtest -iwlan0 -c/data/misc/wifi/wpa_supplicant_test.conf -ddd
 +    class late_start
 +    user root
@@ -89,6 +94,18 @@ index 83b7f8a..2864fc6 100644
 +    user root
 +    group wifi net
 +    oneshot 
++
++# Darwin Streaming Server.
++service dss /system/bin/DarwinStreamingServer -d
++    class late_start
++    user root
++    disabled
++    oneshot
++
++service dss-setup /system/bin/sh /system/etc/init.goldfish.dss.sh
++    class late_start
++    user root
++    oneshot
 +
  # enable Google-specific location features,
  # like NetworkLocationProvider and LocationCollector
@@ -98,7 +115,7 @@ index 83b7f8a..2864fc6 100644
  # account info for the device via these two properties.  Google
  # Login Service will insert these accounts into the database when
  # it is created (ie, after a data wipe).
-@@ -71,8 +126,15 @@ service qemud /system/bin/qemud
+@@ -71,8 +143,15 @@ service qemud /system/bin/qemud
  # -Q is a special logcat option that forces the
  # program to check wether it runs on the emulator
  # if it does, it redirects its output to the device