Merge lp:~sergiusens/ubuntu/trusty/android-tools/split_job into lp:ubuntu/trusty/android-tools

[Sergio Schvezov]

Need to actually trigger the real job with the android brigde property change

Unmerged revisions

25. By Sergio Schvezov on 2013-10-30

Splitting the android-tools-adbd upstart job to start early on debug or
start when plugged.

=== added file 'debian/android-tools-adbd-debug.upstart'
--- debian/android-tools-adbd-debug.upstart	1970-01-01 00:00:00 +0000
+++ debian/android-tools-adbd-debug.upstart	2013-10-30 17:10:56 +0000
@@ -0,0 +1,38 @@
+# adbd - run adb debugging shell
+#
+# This task enables the adb shell
+
+description	"adbd debug"
+
+start on filesystem or runlevel [2345]
+
+task
+
+pre-start script
+	[ -f /userdata/.debuggable_image ] || { stop; exit 0; }
+	if [ -d /sys/class/android_usb ]
+	then
+	# retrieve the product info from Android
+	manufacturer=$(getprop ro.product.manufacturer Android)
+	model=$(getprop ro.product.model Android)
+	serial=$(getprop ro.serialno 0123456789ABCDEF)
+
+	echo 0 >/sys/class/android_usb/android0/enable
+	echo 18d1 >/sys/class/android_usb/android0/idVendor
+	echo D002 >/sys/class/android_usb/android0/idProduct
+	echo adb >/sys/class/android_usb/android0/functions
+
+	echo -n $manufacturer >/sys/class/android_usb/android0/iManufacturer
+	echo -n $model >/sys/class/android_usb/android0/iProduct
+	echo -n $serial >/sys/class/android_usb/android0/iSerial
+
+	echo 1 >/sys/class/android_usb/android0/enable
+
+	else
+	grep -q qemu /proc/cmdline || { stop; exit 0; }
+	fi
+end script
+
+script
+    /sbin/initctl start android-tools-adbd
+end script

=== modified file 'debian/android-tools-adbd.upstart'
--- debian/android-tools-adbd.upstart	2013-10-29 12:19:42 +0000
+++ debian/android-tools-adbd.upstart	2013-10-30 17:10:56 +0000
@@ -4,33 +4,9 @@
 
 description	"adbd"
 
-start on filesystem or runlevel [2345]
-stop on runlevel [!2345]
+start on android-usb-connected
+stop on (android-usb-disconnected or runlevel [!2345])
 
 respawn
 
-pre-start script
-	if [ -d /sys/class/android_usb ]
-	then
-	# retrieve the product info from Android
-	manufacturer=$(getprop ro.product.manufacturer Android)
-	model=$(getprop ro.product.model Android)
-	serial=$(getprop ro.serialno 0123456789ABCDEF)
-
-	echo 0 >/sys/class/android_usb/android0/enable
-	echo 18d1 >/sys/class/android_usb/android0/idVendor
-	echo D002 >/sys/class/android_usb/android0/idProduct
-	echo adb >/sys/class/android_usb/android0/functions
-
-	echo -n $manufacturer >/sys/class/android_usb/android0/iManufacturer
-	echo -n $model >/sys/class/android_usb/android0/iProduct
-	echo -n $serial >/sys/class/android_usb/android0/iSerial
-
-	echo 1 >/sys/class/android_usb/android0/enable
-
-	else
-	grep -q qemu /proc/cmdline || { stop; exit 0; }
-	fi
-end script
-
 exec /usr/bin/adbd

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-29 12:19:42 +0000
+++ debian/changelog	2013-10-30 17:10:56 +0000
@@ -1,3 +1,10 @@
+android-tools (4.2.2+git20130218-3ubuntu19) UNRELEASED; urgency=low
+
+  * Splitting the android-tools-adbd upstart job to start early on debug or
+    start when plugged.
+
+ -- Sergio Schvezov <[e-mail]>  Wed, 30 Oct 2013 10:34:47 -0300
+
 android-tools (4.2.2+git20130218-3ubuntu18) trusty; urgency=low
 
   * Fix adbd upstart pre-start logic.