Bug 903528 - Part 1: Rename background.apk to background-junit3.apk. r=rnewman

This is a cautionary move: when uploaded to infrastructure,
background.apk will not look so bad; but browser.apk is likely to
confuse folks. (These files will be in the same directory as
fennec-*apk, and sort earlier than that file.)

I considered including "tests" in the name, but decided not to make a
long name even longer.

This also renames the Android package. This is purely cosmetic, since
the package has no consumers (infrastructure, mach, etc). But this looks
nicer in IDEs: the generated classes fit into the class hierarchy.

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

@@ -7,7 +7,7 @@
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="8"
-              android:targetSdkVersion="14" />
+              android:targetSdkVersion="16" />
 
     <uses-permission android:name="@ANDROID_BACKGROUND_TARGET_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
     <uses-permission android:name="@ANDROID_BACKGROUND_TARGET_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"/>

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

@@ -2,14 +2,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ANDROID_APK_NAME := background-debug
+ANDROID_APK_NAME := background-junit3-debug
 
 PP_TARGETS        += manifest
 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.background.test' \
+  -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/background/junit3/moz.build

@@ -4,10 +4,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
+
 include('android-services.mozbuild')
 
 main = add_android_eclipse_project('BackgroundInstrumentationTests', OBJDIR + '/AndroidManifest.xml')
-main.package_name = 'org.mozilla.background.test'
+main.package_name = 'org.mozilla.gecko.background.tests'
 main.res = SRCDIR + '/res'
 main.recursive_make_targets += [
     OBJDIR + '/AndroidManifest.xml',

toolkit/mozapps/installer/packager.mk

@@ -380,11 +380,11 @@ INNER_ROBOCOP_PACKAGE= \
 
 BACKGROUND_TESTS_PATH = $(abspath $(_ABS_DIST)/../mobile/android/tests/background/junit3)
 INNER_BACKGROUND_TESTS_PACKAGE= \
-  $(call RELEASE_SIGN_ANDROID_APK,$(BACKGROUND_TESTS_PATH)/background-debug-unsigned-unaligned.apk,$(_ABS_DIST)/background.apk)
+  $(call RELEASE_SIGN_ANDROID_APK,$(BACKGROUND_TESTS_PATH)/background-junit3-debug-unsigned-unaligned.apk,$(_ABS_DIST)/background-junit3.apk)
 endif
 else
 INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you'
-INNER_BACKGROUND_TESTS_PACKAGE=echo 'Testing is disabled - No Android Background tests for you'
+INNER_BACKGROUND_TESTS_PACKAGE=echo 'Testing is disabled - No Android Background JUnit 3 tests for you'
 endif
 
 # Create geckoview_library/geckoview_{assets,library}.zip for third-party GeckoView consumers.