Bug 1303806 - 1. Move classes from geckoview to Fennec; r=nalexander
authorJim Chen <nchen@mozilla.com>
Tue, 20 Sep 2016 17:42:08 -0400
changeset 314546 6d79ca15a25b4827f3a6d40406f5bcb7c132528c
parent 314545 a6975f404e1d6837a6094b025486911147672f3a
child 314547 6291e10b1bdbcd917cdd2f21c9193707d967516d
push id81925
push usernchen@mozilla.com
push dateTue, 20 Sep 2016 21:42:28 +0000
treeherdermozilla-inbound@005bf983f9e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1303806
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1303806 - 1. Move classes from geckoview to Fennec; r=nalexander ANRReporter is a telemetry tool that belongs in Fennec code. GeckoJavaSampler is a developer tool that belongs in Fennec code. SwipeDismissListViewTouchListener is only used in FormAssistPopup, which is no longer referenced in geckoview code.
mobile/android/base/java/org/mozilla/gecko/ANRReporter.java
mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
mobile/android/base/moz.build
mobile/android/geckoview/src/main/java/org/mozilla/gecko/ANRReporter.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/ANRReporter.java
rename to mobile/android/base/java/org/mozilla/gecko/ANRReporter.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
rename from mobile/android/geckoview/src/main/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -208,30 +208,28 @@ if CONFIG['MOZ_WEBRTC']:
     wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast']
 
 gvjar = add_java_jar('gecko-view')
 
 gvjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x
                   for x in [
     'AlarmReceiver.java',
     'AndroidGamepadManager.java',
-    'ANRReporter.java',
     'BaseGeckoInterface.java',
     'ContextGetter.java',
     'CrashHandler.java',
     'EventDispatcher.java',
     'GeckoAccessibility.java',
     'GeckoAppShell.java',
     'GeckoBatteryManager.java',
     'GeckoEditable.java',
     'GeckoEditableClient.java',
     'GeckoEditableListener.java',
     'GeckoHalDefines.java',
     'GeckoInputConnection.java',
-    'GeckoJavaSampler.java',
     'GeckoNetworkManager.java',
     'GeckoProfile.java',
     'GeckoProfileDirectories.java',
     'GeckoScreenOrientation.java',
     'GeckoService.java',
     'GeckoSharedPrefs.java',
     'GeckoSmsManager.java',
     'GeckoThread.java',
@@ -284,17 +282,16 @@ gvjar.sources += [geckoview_source_dir +
     'permissions/PermissionsHelper.java',
     'PrefsHelper.java',
     'SmsManager.java',
     'sqlite/ByteBufferInputStream.java',
     'sqlite/MatrixBlobCursor.java',
     'sqlite/SQLiteBridge.java',
     'sqlite/SQLiteBridgeException.java',
     'TouchEventInterceptor.java',
-    'widget/SwipeDismissListViewTouchListener.java',
 ]]
 
 gvjar.sources += [geckoview_thirdparty_source_dir + f for f in [
     'java/com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',
     'java/com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',
     'java/com/googlecode/eyesfree/braille/selfbraille/WriteData.java',
 ]]
 
@@ -325,16 +322,17 @@ gbjar.sources += ['java/org/mozilla/geck
     'ActionModeCompatView.java',
     'ActivityHandlerHelper.java',
     'activitystream/ActivityStream.java',
     'animation/AnimationUtils.java',
     'animation/HeightChangeAnimation.java',
     'animation/PropertyAnimator.java',
     'animation/Rotate3DAnimation.java',
     'animation/ViewHelper.java',
+    'ANRReporter.java',
     'BootReceiver.java',
     'BrowserApp.java',
     'BrowserLocaleManager.java',
     'cleanup/FileCleanupController.java',
     'cleanup/FileCleanupService.java',
     'CustomEditText.java',
     'customtabs/CustomTabsActivity.java',
     'customtabs/GeckoCustomTabsService.java',
@@ -428,16 +426,17 @@ gbjar.sources += ['java/org/mozilla/geck
     'firstrun/RestrictedWelcomePanel.java',
     'firstrun/SyncPanel.java',
     'firstrun/TabQueuePanel.java',
     'FormAssistPopup.java',
     'GeckoActivity.java',
     'GeckoActivityStatus.java',
     'GeckoApp.java',
     'GeckoApplication.java',
+    'GeckoJavaSampler.java',
     'GeckoMessageReceiver.java',
     'GeckoProfilesProvider.java',
     'GeckoUpdateReceiver.java',
     'GlobalHistory.java',
     'GuestSession.java',
     'health/HealthRecorder.java',
     'health/SessionInformation.java',
     'health/StubbedHealthRecorder.java',
@@ -746,16 +745,17 @@ gbjar.sources += ['java/org/mozilla/geck
     'widget/IconTabWidget.java',
     'widget/LoginDoorHanger.java',
     'widget/RecyclerViewClickSupport.java',
     'widget/ResizablePathDrawable.java',
     'widget/RoundedCornerLayout.java',
     'widget/SiteLogins.java',
     'widget/SquaredImageView.java',
     'widget/SquaredRelativeLayout.java',
+    'widget/SwipeDismissListViewTouchListener.java',
     'widget/TabThumbnailWrapper.java',
     'widget/ThumbnailView.java',
     'widget/TwoWayView.java',
     'ZoomedView.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.