Bug 1361545 - Follow-up to fix Android Gradle builds. r=me draft
authorNick Alexander <nalexander@mozilla.com>
Wed, 03 May 2017 10:14:59 -0700
changeset 571984 18547322f5f1efcbc5e793bbce19774c09cdd8f4
parent 571973 477ef683f850ff11cfa128e17855666bb7758a7a
child 626939 86bc9598df530c4a7ea458449da6ff498c62c78e
push id56984
push usernalexander@mozilla.com
push dateWed, 03 May 2017 17:16:55 +0000
reviewersme
bugs1361545
milestone55.0a1
Bug 1361545 - Follow-up to fix Android Gradle builds. r=me MozReview-Commit-ID: 5EDuLU0xFdy
testing/mochitest/Makefile.in
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -20,17 +20,17 @@ libs::
 
 # On Android only, include a release signed Robocop APK in the test package.
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 include $(topsrcdir)/config/android-common.mk
 
 ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
 robocop_apk := $(topobjdir)/mobile/android/tests/browser/robocop/robocop-debug-unsigned-unaligned.apk
 else
-robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-automation-debug-androidTest-unaligned.apk
+robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-official-australis-debug-androidTest-unaligned.apk
 endif
 
 stage-package-android:
 	$(NSINSTALL) -D $(_DEST_DIR)
 	$(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(_DEST_DIR)/robocop.apk)
 
 stage-package: stage-package-android
 endif
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -1017,17 +1017,17 @@ class AndroidArguments(ArgumentContainer
                     "Unable to find specified robocop .ini manifest '%s'" %
                     options.robocopIni)
             options.robocopIni = os.path.abspath(options.robocopIni)
 
             if not options.robocopApk and build_obj:
                 if build_obj.substs.get('MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE'):
                     options.robocopApk = os.path.join(build_obj.topobjdir, 'gradle', 'build',
                                                       'mobile', 'android', 'app', 'outputs', 'apk',
-                                                      'app-automation-debug-androidTest-'
+                                                      'app-official-australis-debug-androidTest-'
                                                       'unaligned.apk')
                 else:
                     options.robocopApk = os.path.join(build_obj.topobjdir, 'mobile', 'android',
                                                       'tests', 'browser',
                                                       'robocop', 'robocop-debug.apk')
 
         if options.robocopApk != "":
             if not os.path.exists(options.robocopApk):