Bug 1433322 - 1. Move publicsuffix utils to under Fennec; r=nalexander draft
authorJim Chen <nchen@mozilla.com>
Thu, 01 Feb 2018 16:48:37 -0500
changeset 750310 359ecf316af4527caa11541848c2bf40399b3265
parent 750207 a23212941fcd1d8ecc2862cc139dfcbb7f029aa2
child 750311 05e73da3a9d4192d2f72184f1b86a7fe32083787
push id97617
push userbmo:nchen@mozilla.com
push dateThu, 01 Feb 2018 21:49:08 +0000
reviewersnalexander
bugs1433322
milestone60.0a1
Bug 1433322 - 1. Move publicsuffix utils to under Fennec; r=nalexander The publicsuffix utils are not used in GeckoView and more importantly, their accompanying asset is only included in Fennec and not GeckoView. Therefore, it makes sense to move the utils to Fennec. MozReview-Commit-ID: A5jhiqURUdB
mobile/android/base/java/org/mozilla/gecko/util/publicsuffix/PublicSuffix.java
mobile/android/base/java/org/mozilla/gecko/util/publicsuffix/PublicSuffixPatterns.java
mobile/android/base/moz.build
mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/publicsuffix/PublicSuffix.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/publicsuffix/PublicSuffixPatterns.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/publicsuffix/PublicSuffix.java
rename to mobile/android/base/java/org/mozilla/gecko/util/publicsuffix/PublicSuffix.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/publicsuffix/PublicSuffixPatterns.java
rename to mobile/android/base/java/org/mozilla/gecko/util/publicsuffix/PublicSuffixPatterns.java
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -286,18 +286,16 @@ gujar.sources += [geckoview_source_dir +
     'util/IOUtils.java',
     'util/JSONUtils.java',
     'util/MapUtils.java',
     'util/MenuUtils.java',
     'util/NetworkUtils.java',
     'util/NonEvictingLruCache.java',
     'util/PrefUtils.java',
     'util/ProxySelector.java',
-    'util/publicsuffix/PublicSuffix.java',
-    'util/publicsuffix/PublicSuffixPatterns.java',
     'util/RawResource.java',
     'util/StringUtils.java',
     'util/ThreadUtils.java',
     'util/UIAsyncTask.java',
     'util/UUIDUtil.java',
     'util/WeakReferenceHandler.java',
     'util/WindowUtils.java',
 ]]
@@ -921,16 +919,18 @@ gbjar.sources += ['java/org/mozilla/geck
     'trackingprotection/TrackingProtectionPrompt.java',
     'updater/PostUpdateHandler.java',
     'updater/UpdateService.java',
     'updater/UpdateServiceHelper.java',
     'util/ColorUtil.java',
     'util/DrawableUtil.java',
     'util/JavaUtil.java',
     'util/PackageUtil.java',
+    'util/publicsuffix/PublicSuffix.java',
+    'util/publicsuffix/PublicSuffixPatterns.java',
     'util/ResourceDrawableUtils.java',
     'util/ShortcutUtils.java',
     'util/TouchTargetUtil.java',
     'util/URIUtils.java',
     'util/ViewUtil.java',
     'util/WindowUtil.java',
     'webapps/WebAppActivity.java',
     'webapps/WebAppIndexer.java',