Bug 979064 - Declare JUnit 3 instrumentation test applications debuggable. r=rnewman

I also took the opportunity to move a constant into
AndroidManifest.xml.in; it removes a layer of indirection when trying to
determine what Android package gets built.

mobile/android/tests/background/junit3/AndroidManifest.xml.in

@@ -1,7 +1,7 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="@ANDROID_BACKGROUND_TEST_PACKAGE_NAME@"
+    package="org.mozilla.gecko.background.tests"
     sharedUserId="@MOZ_ANDROID_SHARED_ID@"
     android:versionCode="1"
     android:versionName="1.0" >
@@ -14,12 +14,12 @@
     <uses-permission android:name="@ANDROID_BACKGROUND_TARGET_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"/>
 
     <application
+        android:debuggable="true"
         android:icon="@drawable/icon"
         android:label="@ANDROID_BACKGROUND_APP_DISPLAYNAME@">
         <uses-library android:name="android.test.runner" />
     </application>
 
-
     <instrumentation
         android:label="@string/app_name"
         android:name="android.test.InstrumentationTestRunner"

mobile/android/tests/background/junit3/Makefile.in

@@ -9,7 +9,6 @@ manifest          := $(srcdir)/AndroidManifest.xml.in
 manifest_TARGET   := AndroidManifest.xml
 manifest_FLAGS    += \
   -DANDROID_BACKGROUND_TARGET_PACKAGE_NAME='$(ANDROID_PACKAGE_NAME)' \
-  -DANDROID_BACKGROUND_TEST_PACKAGE_NAME='org.mozilla.gecko.background.tests' \
   -DANDROID_BACKGROUND_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME) Background Tests' \
   -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \
   -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE='$(ANDROID_PACKAGE_NAME)_sync' \

mobile/android/tests/browser/junit3/AndroidManifest.xml.in

@@ -1,7 +1,7 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="@ANDROID_BROWSER_TEST_PACKAGE_NAME@"
+    package="org.mozilla.gecko.browser.tests"
     sharedUserId="@MOZ_ANDROID_SHARED_ID@"
     android:versionCode="1"
     android:versionName="1.0" >
@@ -14,6 +14,7 @@
     <uses-permission android:name="@ANDROID_BROWSER_TARGET_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"/>
 
     <application
+        android:debuggable="true"
         android:icon="@drawable/icon"
         android:label="@ANDROID_BROWSER_APP_DISPLAYNAME@">
         <uses-library android:name="android.test.runner" />

mobile/android/tests/browser/junit3/Makefile.in

@@ -12,7 +12,6 @@ PP_TARGETS += manifest
 manifest := AndroidManifest.xml.in
 manifest_FLAGS += \
   -DANDROID_BROWSER_TARGET_PACKAGE_NAME='$(ANDROID_PACKAGE_NAME)' \
-  -DANDROID_BROWSER_TEST_PACKAGE_NAME='org.mozilla.gecko.browser.tests' \
   -DANDROID_BROWSER_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME) Browser Tests' \
   -DMOZ_ANDROID_SHARED_ID='$(ANDROID_PACKAGE_NAME).sharedID' \
   $(NULL)