author Nevin Chen <cnevinchen@gmail.com>

Wed, 15 Nov 2017 07:22:34 +0800

changeset 719458 bf46ae19a62fc2ec3bba001acb14cb07b224d2f7

parent 715543 7d81f423c7ff33c6be38b51e50bd8934e0b50dd9

child 719459 1b9b136d8ecca52b60aa2d44f6837525b1443dbd

push id 95274

push user bmo:cnevinchen@gmail.com

push date Fri, 12 Jan 2018 08:44:43 +0000

reviewers maliu

bugs 1417255

milestone 59.0a1

build.gradle file | annotate | diff | comparison | revisions

mobile/android/app/build.gradle file | annotate | diff | comparison | revisions

mobile/android/app/src/androidTest/java/org/mozilla/gecko/EspressoOnly.java file | annotate | diff | comparison | revisions

mobile/android/app/src/androidTest/java/org/mozilla/gecko/PwaBadgeTest.java file | annotate | diff | comparison | revisions

mobile/android/app/src/espresso/assets/pwa_test_site/badge_display.html file | annotate | diff | comparison | revisions

mobile/android/app/src/espresso/assets/pwa_test_site/badge_hide.html file | annotate | diff | comparison | revisions

mobile/android/app/src/espresso/assets/pwa_test_site/images/icon.png file | annotate | diff | comparison | revisions

mobile/android/app/src/espresso/assets/pwa_test_site/pwa.webmanifest file | annotate | diff | comparison | revisions

mobile/android/app/src/espresso/java/org/mozilla/gecko/uitest/UiTestConfig.java file | annotate | diff | comparison | revisions

mobile/android/app/src/local/java/org/mozilla/gecko/uitest/UiTestConfig.java file | annotate | diff | comparison | revisions

mobile/android/app/src/localOld/java/org/mozilla/gecko/uitest/UiTestConfig.java file | annotate | diff | comparison | revisions

mobile/android/app/src/official/java/org/mozilla/gecko/uitest/UiTestConfig.java file | annotate | diff | comparison | revisions

mobile/android/base/AppConstants.java.in file | annotate | diff | comparison | revisions

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java file | annotate | diff | comparison | revisions

mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java file | annotate | diff | comparison | revisions

mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java file | annotate | diff | comparison | revisions

mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java file | annotate | diff | comparison | revisions

mobile/android/base/moz.build file | annotate | diff | comparison | revisions

mobile/android/config/proguard/proguard-test.pro file | annotate | diff | comparison | revisions

testing/config/tooltool-manifests/linux64/hostutils.manifest file | annotate | diff | comparison | revisions
--- a/build.gradle
+++ b/build.gradle
@@ -10,16 +10,19 @@ def tryInt = { string ->
 
 allprojects {
     // Expose the per-object-directory configuration to all projects.
     ext {
         mozconfig = gradle.mozconfig
         topsrcdir = gradle.mozconfig.topsrcdir
         topobjdir = gradle.mozconfig.topobjdir
 
+        espressoVersion = '3.0.1'
+        androidTestVersion = '1.0.1'
+
         compileSdkVersion = tryInt(mozconfig.substs.ANDROID_COMPILE_SDK_VERSION)
         buildToolsVersion = tryInt(mozconfig.substs.ANDROID_BUILD_TOOLS_VERSION)
         targetSdkVersion = tryInt(mozconfig.substs.ANDROID_TARGET_SDK)
         minSdkVersion = tryInt(mozconfig.substs.MOZ_ANDROID_MIN_SDK_VERSION)
         manifestPlaceholders = [
             ANDROID_PACKAGE_NAME: mozconfig.substs.ANDROID_PACKAGE_NAME,
             ANDROID_TARGET_SDK: mozconfig.substs.ANDROID_TARGET_SDK,
             MOZ_ANDROID_MIN_SDK_VERSION: mozconfig.substs.MOZ_ANDROID_MIN_SDK_VERSION,
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -58,16 +58,17 @@ android {
         // unfortunate side effect of Proguarding the instrumentation (Robocop) APK, but nothing
         // uses runtime inspection or class-loading with that APK, so it shouldn't be a problem.
         def configureMinifyClosure = {
             // Bug 1229269: we can't yet shrinkResources effectively.  Be sure
             // to use -stripped.ap_ after enabling this.
             // shrinkResources true
             minifyEnabled true
             proguardFile "${topsrcdir}/mobile/android/config/proguard/proguard.cfg"
+            testProguardFile "${topsrcdir}/mobile/android/config/proguard/proguard-test.pro"
         }
         release configureMinifyClosure
         if (mozconfig.substs.MOZILLA_OFFICIAL) {
             debug configureMinifyClosure
         }
     }
 
     // The "audience" flavour dimension distinguishes between _local_ builds (intended for
@@ -76,16 +77,25 @@ android {
     //
     // The "skin" flavor dimension distinguishes between different user interfaces.  We sometimes
     // want to develop significant new user interface pieces in-tree that don't ship (even in the
     // Nightly channel) while under development.  A new "skin" flavour allows us to develop such
     // pieces in Gradle without changing the mainline configuration.
     flavorDimensions "audience", "skin"
 
     productFlavors {
+        espresso{
+            dimension "audience"
+
+            testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+            testInstrumentationRunnerArgument 'annotation', 'org.mozilla.gecko.EspressoOnly'
+            testOptions {
+                animationsDisabled = true
+            }
+        }
         // For API 21+ - with pre-dexing, this will be faster for local development.
         local {
             dimension "audience"
 
             // For pre-dexing, setting `minSdkVersion 21` allows the Android gradle plugin to
             // pre-DEX each module and produce an APK that can be tested on
             // Android Lollipop without time consuming DEX merging processes.
             minSdkVersion 21
@@ -205,16 +215,18 @@ android {
         }
 
         androidTest {
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src"
                 // Bug 1229149 tracks pushing this into a :services Gradle project.
                 srcDir "${topsrcdir}/mobile/android/services/src/androidTest/java"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"
+                srcDir "${topsrcdir}/mobile/android/app/src/androidTest/java"
+
             }
             res {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/res"
             }
             assets {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/assets"
             }
         }
@@ -260,20 +272,41 @@ dependencies {
     // Include LeakCanary in most gradle based builds. LeakCanary adds about 5k methods, so we disable
     // it for the (non-proguarded, non-predex) localOld builds to allow space for other libraries.
     // Gradle based tests include the no-op version.  Mach based builds only include the no-op version
     // of this library.
     // It doesn't seem like there is a non-trivial way to be conditional on 'localOld', so instead we explicitly
     // define a version of leakcanary for every flavor:
     localCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
     localOldCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
+    espressoCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
+
     officialCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
     officialCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
 
+    androidTestCompile ("com.android.support.test.espresso:espresso-core:$project.ext.espressoVersion"){
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+    }
+    androidTestCompile ("com.android.support.test:runner:$project.ext.androidTestVersion"){
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+    }
+    // Note that espresso-idling-resource is used in the code under test.
+    espressoCompile "com.android.support.test.espresso:espresso-idling-resource:$project.ext.espressoVersion";
+
+
+
     // With a simple "compile", Gradle will always build these libraries in their default configuration
     // (i.e. release), so we need to explicitly forward our own build configuration here (bug 1385695).
     //
     // Official builds compile a hacked up app:Official..Debug, but need the
     // release versions of the dependencies, in order to not have debugging
     // information.  It's not yet possible to specify just officialDebug, so we
     // hack around it here.
     if (mozconfig.substs.MOZILLA_OFFICIAL) {
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/androidTest/java/org/mozilla/gecko/EspressoOnly.java
@@ -0,0 +1,17 @@
+package org.mozilla.gecko;
+
+
+import android.support.annotation.Keep;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+// https://medium.com/@satyajit/running-subset-of-espresso-tests-locally-and-gcloud-4713931da56
+//Needed to have annotations at a test level
+@Keep
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EspressoOnly {
+}
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/androidTest/java/org/mozilla/gecko/PwaBadgeTest.java
@@ -0,0 +1,31 @@
+package org.mozilla.gecko;
+
+import android.support.annotation.Keep;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+@EspressoOnly
+@Keep
+@RunWith(AndroidJUnit4.class)
+public class PwaBadgeTest {
+
+    @Rule
+    public ActivityTestRule<BrowserApp> activityRule = new ActivityTestRule<>(BrowserApp.class);
+
+    @Test
+    public void simpleTest() {
+
+        onView(withId(R.id.url_bar_title_scroll_view)).check(matches(isDisplayed()));
+
+    }
+
+}
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/espresso/assets/pwa_test_site/badge_display.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title> test pwa</title>
+    <link rel="manifest" href="pwa.webmanifest">
+</head>
+<body>
+TEST
+</body>
+</html>
+
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/espresso/assets/pwa_test_site/badge_hide.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title> test pwa</title>
+</head>
+<body>
+TEST
+</body>
+</html>
+
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/espresso/assets/pwa_test_site/pwa.webmanifest
@@ -0,0 +1,16 @@
+{
+	"short_name": "PWA TEST",
+	"name": "PWA TEST",
+	"display": "standalone",
+	"icons": [
+	
+		{
+			"src": "images/icon.png",
+			"sizes": "192x192",
+			"type": "image/png"
+		}
+	],
+	"start_url": ".",
+	"theme_color": "#64c639",
+	"background_color": "#3c3c3c"
+}
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/espresso/java/org/mozilla/gecko/uitest/UiTestConfig.java
@@ -0,0 +1,21 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+package org.mozilla.gecko.uitest;
+
+
+import android.support.annotation.VisibleForTesting;
+
+public class UiTestConfig {
+
+    // This method has different implementations among flavors.
+    // Only implementation in espresso flavor will return true;
+    // We do this because mach build can't recognize BuildConfig generated by Gradle build
+    @VisibleForTesting
+    public static boolean underUiTest() {
+        return true;
+    }
+
+
+}
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/local/java/org/mozilla/gecko/uitest/UiTestConfig.java
@@ -0,0 +1,16 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+package org.mozilla.gecko.uitest;
+
+
+public class UiTestConfig {
+
+
+    public static boolean underUiTest() {
+        return false;
+    }
+
+
+}
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/localOld/java/org/mozilla/gecko/uitest/UiTestConfig.java
@@ -0,0 +1,16 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+package org.mozilla.gecko.uitest;
+
+
+public class UiTestConfig {
+
+
+    public static boolean underUiTest() {
+        return false;
+    }
+
+
+}
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/official/java/org/mozilla/gecko/uitest/UiTestConfig.java
@@ -0,0 +1,16 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+package org.mozilla.gecko.uitest;
+
+
+public class UiTestConfig {
+
+
+    public static boolean underUiTest() {
+        return false;
+    }
+
+
+}
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -329,9 +329,10 @@ public class AppConstants {
 //#endif
 
     public static final String MOZ_POCKET_API_KEY =
 //#ifdef MOZ_ANDROID_POCKET
         "@MOZ_POCKET_API_KEY@";
 //#else
         null;
 //#endif
+
 }
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -267,16 +267,26 @@ public class BrowserApp extends GeckoApp
     public static final String TAB_HISTORY_FRAGMENT_TAG = "tabHistoryFragment";
 
     // When the static action bar is shown, only the real toolbar chrome should be
     // shown when the toolbar is visible. Causing the toolbar animator to also
     // show the snapshot causes the content to shift under the users finger.
     // See: Bug 1358554
     private boolean mShowingToolbarChromeForActionBar;
 
+    private PwaBadgeListener pwaBadgeListener;
+
+    public void setPwaBadgeListener(PwaBadgeListener listener) {
+        pwaBadgeListener = listener;
+    }
+
+    interface PwaBadgeListener {
+        void onPwaBadgeChange();
+    }
+
     private static class MenuItemInfo {
         public int id;
         public String label;
         public boolean checkable;
         public boolean checked;
         public boolean enabled = true;
         public boolean visible = true;
         public int parent;
@@ -794,16 +804,17 @@ public class BrowserApp extends GeckoApp
             "Tab:Added",
             "Video:Play",
             "CharEncoding:Data",
             "CharEncoding:State",
             "Settings:Show",
             "Updater:Launch",
             "Sanitize:Finished",
             "Sanitize:OpenTabs",
+            "PageActions:Add",
             null);
 
         EventDispatcher.getInstance().registerBackgroundThreadListener(this,
             "Experiments:GetActive",
             "Experiments:SetOverride",
             "Experiments:ClearOverride",
             "Favicon:Request",
             "Feedback:MaybeLater",
@@ -1616,16 +1627,17 @@ public class BrowserApp extends GeckoApp
             "Tab:Added",
             "Video:Play",
             "CharEncoding:Data",
             "CharEncoding:State",
             "Settings:Show",
             "Updater:Launch",
             "Sanitize:Finished",
             "Sanitize:OpenTabs",
+            "PageActions:Add",
             null);
 
         EventDispatcher.getInstance().unregisterBackgroundThreadListener(this,
             "Experiments:GetActive",
             "Experiments:SetOverride",
             "Experiments:ClearOverride",
             "Favicon:Request",
             "Feedback:MaybeLater",
@@ -2199,16 +2211,21 @@ public class BrowserApp extends GeckoApp
                             BrowserDB.from(getProfile()),
                             contentProviderClient,
                             location, hasImage, metadata);
                 } finally {
                     contentProviderClient.release();
                 }
 
                 break;
+            case "PageActions:Add":
+                if (pwaBadgeListener != null) {
+                    pwaBadgeListener.onPwaBadgeChange();
+                }
+                break;
 
             default:
                 super.handleMessage(event, message, callback);
                 break;
         }
     }
 
     /**
--- a/mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java
+++ b/mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java
@@ -2,16 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 package org.mozilla.gecko.pwa;
 
 import android.support.annotation.CheckResult;
 
 import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.uitest.UiTestConfig;
 
 
 public class PwaUtils {
     /**
      * Check if this tab should add as PWA shortcut
      * From the document :https://developers.google.com/web/fundamentals/security/encrypt-in-transit/why-https
      * PWA must be served from a secure origin. We also restrict it to
      * 1. Not allow user accept exception
@@ -21,11 +22,19 @@ public class PwaUtils {
      * @return true if the tab shouldAddPwaShortcut
      */
     @CheckResult
     public static boolean shouldAddPwaShortcut(Tab tab) {
         final boolean secure = tab.getSiteIdentity().isSecure();
         // This tab is safe for pwa only when the site is absolutely secure.
         // so no exception is allowed
         final boolean exception = tab.getSiteIdentity().isSecurityException();
-        return !tab.isPrivate() && secure && !exception;
+
+        // There's no https/mixed content check for espresso.... for now.
+        if (UiTestConfig.underUiTest()) {
+            return !tab.isPrivate();
+        } else {
+            return !tab.isPrivate() && secure && !exception;
+        }
+
+
     }
 }
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java
@@ -7,16 +7,17 @@ package org.mozilla.gecko.toolbar;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
 import android.graphics.Rect;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+
 import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.Clipboard;
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
@@ -1,15 +1,16 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 package org.mozilla.gecko.toolbar;
 
+import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.pwa.PwaUtils;
 import org.mozilla.gecko.util.DrawableUtil;
@@ -153,20 +154,20 @@ public class PageActionLayout extends Th
                 @Override
                 public boolean onLongClick(String id) {
                     final GeckoBundle data = new GeckoBundle(1);
                     data.putString("id", id);
                     EventDispatcher.getInstance().dispatch("PageActions:LongClicked", data);
                     return true;
                 }
             }, important);
-
         } else if ("PageActions:Remove".equals(event)) {
             removePageAction(message.getString("id"));
         }
+
     }
 
     private void maybeShowPwaOnboarding(String id) {
         // only show pwa at normal mode
         final Tab selectedTab = Tabs.getInstance().getSelectedTab();
         if (!PwaUtils.shouldAddPwaShortcut(selectedTab)) {
             return;
         }
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -982,16 +982,23 @@ gbjar.sources += ['java/org/mozilla/geck
     'widget/SquaredImageView.java',
     'widget/SquaredRelativeLayout.java',
     'widget/SwipeDismissListViewTouchListener.java',
     'widget/SwitchPreferenceView.java',
     'widget/TabThumbnailWrapper.java',
     'widget/ThumbnailView.java',
     'widget/TouchDelegateWithReset.java',
 ]]
+
+# We only pick the file in official flavor for mach build (underUiTest() will return false) .
+# The other UiTestConfig in other flavors are only used by Gradle
+gbjar.sources += ['../app/src/official/java/org/mozilla/gecko/' + x for x in [
+    'uitest/UiTestConfig.java'
+]]
+
 # The following sources are checked in to version control but
 # generated by a script (java/org/mozilla/gecko/widget/themed/generate_themed_views.py).
 # If you're editing this list, make sure to edit that script.
 gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'widget/themed/ThemedEditText.java',
     'widget/themed/ThemedFrameLayout.java',
     'widget/themed/ThemedImageButton.java',
     'widget/themed/ThemedImageView.java',
@@ -1016,17 +1023,17 @@ gbjar.sources += ['../app/src/photon/jav
     'toolbar/BrowserToolbarTabletBase.java',
     'toolbar/ForwardButton.java',
     'toolbar/TabCounter.java',
     'toolbar/ToolbarDisplayLayout.java',
     'toolbar/ToolbarRoundButton.java',
 ]]
 
 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')
-gbjar.generated_sources = [] # Keep it this way.
+
 gbjar.extra_jars += [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
     'constants.jar',
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
     gbjar.sources += [ 'java/org/mozilla/gecko/CrashReporter.java' ]
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/proguard/proguard-test.pro
@@ -0,0 +1,35 @@
+# proguard-test.cfg:
+-include proguard.cfg
+
+-keepattributes SourceFile,LineNumberTable
+# ------------------- Nevin add -----
+
+#-ignorewarnings
+#-keep class org.kobjects.** { *; }
+#-keep class org.ksoap2.** { *; }
+#-keep class org.kxml2.** { *; }
+-keep class org.xmlpull.** { *; }
+-dontwarn org.xmlpull.**
+
+#-keep class javax.lang.model.element.Modifier
+
+-dontwarn com.squareup.javawriter.JavaWriter
+
+
+# ------------------- TEST DEPENDENCIES -------------------
+-dontwarn org.hamcrest.**
+-dontwarn android.test.**
+-dontwarn android.support.test.**
+
+-keep class org.hamcrest.** {
+   *;
+}
+
+-keep class org.junit.** { *; }
+-dontwarn org.junit.**
+
+-keep class junit.** { *; }
+-dontwarn junit.**
+
+-keep class sun.misc.** { *; }
+-dontwarn sun.misc.**
--- a/testing/config/tooltool-manifests/linux64/hostutils.manifest
+++ b/testing/config/tooltool-manifests/linux64/hostutils.manifest
@@ -1,10 +1,10 @@
 [
   {
-    "size": 72528696,
+    "size": 72112596,
     "visibility": "public",
-    "digest": "6a0ed81e1aa43ad9bb3ebbb32d259fbcb15d7f5bd0bac47471cb41fb29fe74c6ff8ab4559cecd9d4f15c68cf5ad2ed4a8e924e4f89638cb4e2edaa06b65e5527",
+    "digest": "4d3fe61dd8ad9ca09c72e677e8d2d5b7409988de32d6feb9fc55cb0a320a4835b6e2f384a68d2409e89e7a0d2f622bf3ceb9b707e01ad8afe1270ad0d1c9973c",
     "algorithm": "sha512",
-    "filename": "host-utils-58.0a1.en-US-linux-x86_64.tar.gz",
+    "filename": "host-utils-58.0a1.en-US.mac.tar.gz,
     "unpack": true
   }
 ]
author	Nevin Chen <cnevinchen@gmail.com>
	Wed, 15 Nov 2017 07:22:34 +0800
changeset 719458	bf46ae19a62fc2ec3bba001acb14cb07b224d2f7
parent 715543	7d81f423c7ff33c6be38b51e50bd8934e0b50dd9
child 719459	1b9b136d8ecca52b60aa2d44f6837525b1443dbd
push id	95274
push user	bmo:cnevinchen@gmail.com
push date	Fri, 12 Jan 2018 08:44:43 +0000
reviewers	maliu
bugs	1417255
milestone	59.0a1
build.gradle		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/build.gradle		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/androidTest/java/org/mozilla/gecko/EspressoOnly.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/androidTest/java/org/mozilla/gecko/PwaBadgeTest.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/espresso/assets/pwa_test_site/badge_display.html		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/espresso/assets/pwa_test_site/badge_hide.html		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/espresso/assets/pwa_test_site/images/icon.png		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/espresso/assets/pwa_test_site/pwa.webmanifest		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/espresso/java/org/mozilla/gecko/uitest/UiTestConfig.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/local/java/org/mozilla/gecko/uitest/UiTestConfig.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/localOld/java/org/mozilla/gecko/uitest/UiTestConfig.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/app/src/official/java/org/mozilla/gecko/uitest/UiTestConfig.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/AppConstants.java.in		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/java/org/mozilla/gecko/pwa/PwaUtils.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java		file \| annotate \| diff \| comparison \| revisions
mobile/android/base/moz.build		file \| annotate \| diff \| comparison \| revisions
mobile/android/config/proguard/proguard-test.pro		file \| annotate \| diff \| comparison \| revisions
testing/config/tooltool-manifests/linux64/hostutils.manifest		file \| annotate \| diff \| comparison \| revisions