From 21bcae940a19e81634d0facfca620c443cd76bea Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 16 May 2024 22:08:51 +0000 Subject: [PATCH] Bug 1885449 - Move GV code shared between Android and iOS to a shared directory. r=geckoview-reviewers,frontend-codestyle-reviewers,nalexander,owlish And hook them up to the iOS build. Differential Revision: https://phabricator.services.mozilla.com/D204711 --- .eslintrc.js | 25 +++--- .prettierignore | 2 +- browser/modules/Sanitizer.sys.mjs | 2 +- dom/push/components.conf | 2 +- .../components/geckoview/components.conf | 81 ----------------- mobile/android/components/geckoview/moz.build | 27 +----- mobile/android/components/moz.build | 4 - mobile/android/locales/jar.mn | 2 +- mobile/android/modules/geckoview/moz.build | 36 -------- mobile/android/modules/moz.build | 5 -- mobile/android/moz.build | 3 +- .../assets/test-runner-support/manifest.json | 2 +- .../test_runner/TestRunnerApiEngine.java | 2 +- mobile/ios/moz.build | 4 + mobile/shared/.eslintrc.js | 73 +++++++++++++++ .../actors/ContentDelegateChild.sys.mjs | 0 .../actors/ContentDelegateParent.sys.mjs | 0 .../actors/GeckoViewAutoFillChild.sys.mjs | 0 .../actors/GeckoViewAutoFillParent.sys.mjs | 0 .../actors/GeckoViewContentChild.sys.mjs | 0 .../actors/GeckoViewContentParent.sys.mjs | 0 .../GeckoViewExperimentDelegateParent.sys.mjs | 0 .../GeckoViewFormValidationChild.sys.mjs | 0 .../actors/GeckoViewPermissionChild.sys.mjs | 0 .../actors/GeckoViewPermissionParent.sys.mjs | 0 .../GeckoViewPermissionProcessChild.sys.mjs | 0 .../GeckoViewPermissionProcessParent.sys.mjs | 0 .../GeckoViewPrintDelegateChild.sys.mjs | 0 .../GeckoViewPrintDelegateParent.sys.mjs | 0 .../actors/GeckoViewPromptChild.sys.mjs | 0 .../actors/GeckoViewPrompterChild.sys.mjs | 0 .../actors/GeckoViewPrompterParent.sys.mjs | 0 .../actors/GeckoViewSettingsChild.sys.mjs | 0 .../actors/LoadURIDelegateChild.sys.mjs | 0 .../actors/LoadURIDelegateParent.sys.mjs | 0 .../actors/MediaControlDelegateChild.sys.mjs | 0 .../actors/MediaControlDelegateParent.sys.mjs | 0 .../actors/ProgressDelegateChild.sys.mjs | 0 .../actors/ProgressDelegateParent.sys.mjs | 0 .../actors/ScrollDelegateChild.sys.mjs | 0 .../actors/ScrollDelegateParent.sys.mjs | 0 .../SelectionActionDelegateChild.sys.mjs | 0 .../SelectionActionDelegateParent.sys.mjs | 0 .../{android => shared}/actors/metrics.yaml | 0 mobile/{android => shared}/actors/moz.build | 0 .../actors/tests/mochitests/head.js | 0 .../actors/tests/mochitests/mochitest.toml | 0 .../test_geckoview_experiment_delegate.html | 0 .../geckoview/SessionStateAggregator.js | 0 .../chrome/geckoview/config.js | 0 .../chrome/geckoview/config.xhtml | 0 .../chrome/geckoview/geckoview.js | 0 .../chrome/geckoview/geckoview.xhtml | 0 .../chrome/geckoview/jar.mn | 0 .../chrome/geckoview/moz.build | 0 mobile/{android => shared}/chrome/moz.build | 0 .../components/extensions/.eslintrc.js | 0 .../extensions/ExtensionBrowsingData.sys.mjs | 0 .../components/extensions/ext-android.js | 0 .../components/extensions/ext-android.json | 0 .../extensions/ext-browserAction.js | 0 .../components/extensions/ext-c-android.js | 0 .../components/extensions/ext-c-tabs.js | 0 .../components/extensions/ext-downloads.js | 0 .../components/extensions/ext-pageAction.js | 0 .../components/extensions/ext-tabs.js | 0 .../extensions/extensions-mobile.manifest | 0 .../components/extensions/jar.mn | 0 .../components/extensions/moz.build | 0 .../extensions/schemas/LICENSE-CHROMIUM | 0 .../components/extensions/schemas/README.md | 0 .../extensions/schemas/gecko_view_addons.json | 0 .../components/extensions/schemas/jar.mn | 0 .../components/extensions/schemas/moz.build | 0 .../components/extensions/schemas/tabs.json | 0 .../extensions/test/mochitest/.eslintrc.js | 0 .../extensions/test/mochitest/chrome.toml | 0 .../extensions/test/mochitest/context.html | 0 .../context_tabs_onUpdated_iframe.html | 0 .../context_tabs_onUpdated_page.html | 0 .../test/mochitest/file_bypass_cache.sjs | 0 .../extensions/test/mochitest/file_dummy.html | 0 .../test/mochitest/file_iframe_document.html | 0 .../test/mochitest/file_slowed_document.sjs | 0 .../extensions/test/mochitest/head.js | 0 .../extensions/test/mochitest/mochitest.toml | 0 .../test/mochitest/test_ext_all_apis.html | 0 .../test_ext_downloads_event_page.html | 2 +- .../test/mochitest/test_ext_options_ui.html | 0 .../test_ext_tab_runtimeConnect.html | 0 .../test_ext_tabs_autoDiscardable.html | 0 .../test/mochitest/test_ext_tabs_create.html | 0 .../test/mochitest/test_ext_tabs_events.html | 2 +- .../test_ext_tabs_executeScript.html | 2 +- .../test_ext_tabs_executeScript_bad.html | 0 ...test_ext_tabs_executeScript_no_create.html | 2 +- .../test_ext_tabs_executeScript_runAt.html | 2 +- .../test/mochitest/test_ext_tabs_get.html | 0 .../mochitest/test_ext_tabs_getCurrent.html | 0 .../test_ext_tabs_goBack_goForward.html | 0 .../mochitest/test_ext_tabs_insertCSS.html | 0 .../mochitest/test_ext_tabs_lastAccessed.html | 0 .../mochitest/test_ext_tabs_onUpdated.html | 6 +- .../test/mochitest/test_ext_tabs_query.html | 0 .../test/mochitest/test_ext_tabs_reload.html | 0 .../test_ext_tabs_reload_bypass_cache.html | 2 +- .../mochitest/test_ext_tabs_sendMessage.html | 2 +- .../mochitest/test_ext_tabs_update_url.html | 0 .../test_ext_webNavigation_onCommitted.html | 0 .../extensions/test/xpcshell/.eslintrc.js | 0 .../extensions/test/xpcshell/head.js | 0 .../test_ext_native_messaging_geckoview.js | 0 .../test_ext_native_messaging_permissions.js | 0 .../extensions/test/xpcshell/xpcshell.toml | 0 .../geckoview/ColorPickerDelegate.sys.mjs | 0 .../geckoview/FilePickerDelegate.sys.mjs | 0 .../components/geckoview/GeckoView.manifest | 0 .../components/geckoview/GeckoViewHistory.cpp | 0 .../components/geckoview/GeckoViewHistory.h | 0 .../geckoview/GeckoViewPermission.sys.mjs | 0 .../geckoview/GeckoViewPrompt.sys.mjs | 0 .../geckoview/GeckoViewPrompter.sys.mjs | 0 .../geckoview/GeckoViewPush.sys.mjs | 0 .../geckoview/GeckoViewStartup.sys.mjs | 0 .../geckoview/LoginStorageDelegate.sys.mjs | 0 .../geckoview/PromptCollection.sys.mjs | 0 .../geckoview/SessionStoreFunctions.sys.mjs | 0 .../geckoview/ShareDelegate.sys.mjs | 0 .../components/geckoview/components.conf | 89 +++++++++++++++++++ mobile/shared/components/geckoview/moz.build | 38 ++++++++ mobile/shared/components/moz.build | 16 ++++ .../modules/dbg-browser-actors.js | 0 .../geckoview/BrowserUsageTelemetry.sys.mjs | 0 .../geckoview/ChildCrashHandler.sys.mjs | 0 .../modules/geckoview/DelayedInit.sys.mjs | 0 .../geckoview/GeckoViewActorChild.sys.mjs | 0 .../geckoview/GeckoViewActorManager.sys.mjs | 0 .../geckoview/GeckoViewActorParent.sys.mjs | 0 .../geckoview/GeckoViewAutocomplete.sys.mjs | 0 .../geckoview/GeckoViewAutofill.sys.mjs | 0 .../geckoview/GeckoViewChildModule.sys.mjs | 0 .../GeckoViewClipboardPermission.sys.mjs | 0 .../geckoview/GeckoViewConsole.sys.mjs | 0 .../geckoview/GeckoViewContent.sys.mjs | 0 .../GeckoViewContentBlocking.sys.mjs | 0 .../GeckoViewIdentityCredential.sys.mjs | 0 .../geckoview/GeckoViewMediaControl.sys.mjs | 0 .../modules/geckoview/GeckoViewModule.sys.mjs | 0 .../geckoview/GeckoViewNavigation.sys.mjs | 0 .../GeckoViewProcessHangMonitor.sys.mjs | 0 .../geckoview/GeckoViewProgress.sys.mjs | 0 .../geckoview/GeckoViewPushController.sys.mjs | 0 .../geckoview/GeckoViewRemoteDebugger.sys.mjs | 0 .../GeckoViewSelectionAction.sys.mjs | 0 .../geckoview/GeckoViewSessionStore.sys.mjs | 0 .../geckoview/GeckoViewSettings.sys.mjs | 0 .../GeckoViewStorageController.sys.mjs | 0 .../modules/geckoview/GeckoViewTab.sys.mjs | 0 .../geckoview/GeckoViewTelemetry.sys.mjs | 0 .../geckoview/GeckoViewTestUtils.sys.mjs | 0 .../geckoview/GeckoViewTranslations.sys.mjs | 0 .../modules/geckoview/GeckoViewUtils.sys.mjs | 0 .../geckoview/GeckoViewWebExtension.sys.mjs | 0 .../modules/geckoview/LoadURIDelegate.sys.mjs | 0 .../modules/geckoview/MediaUtils.sys.mjs | 0 .../modules/geckoview/Messaging.sys.mjs | 0 .../modules/geckoview/metrics.yaml | 0 mobile/shared/modules/geckoview/moz.build | 44 +++++++++ .../test/xpcshell/test_ChildCrashHandler.js | 0 .../geckoview/test/xpcshell/xpcshell.toml | 0 mobile/shared/modules/moz.build | 18 ++++ .../modules/test/AppUiTestDelegate.sys.mjs | 0 .../modules/test/moz.build | 0 mobile/shared/moz.build | 16 ++++ taskcluster/kinds/source-test/python.yml | 2 +- .../test/data/bugbug-push-schedules.json | 4 +- .../runtimes/manifest-runtimes-android.json | 2 +- .../content/AppTestDelegateParent.sys.mjs | 2 +- toolkit/components/extensions/docs/basics.rst | 6 +- .../test_ext_downloads_download.html | 2 +- .../xpcshell/test_ext_permission_warnings.js | 2 +- .../webidl-api/ExtensionWebIDL.conf | 2 +- toolkit/components/glean/metrics_index.py | 4 +- .../components/passwordmgr/components.conf | 2 +- .../components/prompts/src/components.conf | 2 +- tools/tryselect/try_presets.yml | 4 +- 186 files changed, 347 insertions(+), 198 deletions(-) create mode 100644 mobile/shared/.eslintrc.js rename mobile/{android => shared}/actors/ContentDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/ContentDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewAutoFillChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewAutoFillParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewContentChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewContentParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewExperimentDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewFormValidationChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPermissionChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPermissionParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPermissionProcessChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPermissionProcessParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPrintDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPrintDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPromptChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPrompterChild.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewPrompterParent.sys.mjs (100%) rename mobile/{android => shared}/actors/GeckoViewSettingsChild.sys.mjs (100%) rename mobile/{android => shared}/actors/LoadURIDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/LoadURIDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/MediaControlDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/MediaControlDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/ProgressDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/ProgressDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/ScrollDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/ScrollDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/SelectionActionDelegateChild.sys.mjs (100%) rename mobile/{android => shared}/actors/SelectionActionDelegateParent.sys.mjs (100%) rename mobile/{android => shared}/actors/metrics.yaml (100%) rename mobile/{android => shared}/actors/moz.build (100%) rename mobile/{android => shared}/actors/tests/mochitests/head.js (100%) rename mobile/{android => shared}/actors/tests/mochitests/mochitest.toml (100%) rename mobile/{android => shared}/actors/tests/mochitests/test_geckoview_experiment_delegate.html (100%) rename mobile/{android => shared}/chrome/geckoview/SessionStateAggregator.js (100%) rename mobile/{android => shared}/chrome/geckoview/config.js (100%) rename mobile/{android => shared}/chrome/geckoview/config.xhtml (100%) rename mobile/{android => shared}/chrome/geckoview/geckoview.js (100%) rename mobile/{android => shared}/chrome/geckoview/geckoview.xhtml (100%) rename mobile/{android => shared}/chrome/geckoview/jar.mn (100%) rename mobile/{android => shared}/chrome/geckoview/moz.build (100%) rename mobile/{android => shared}/chrome/moz.build (100%) rename mobile/{android => shared}/components/extensions/.eslintrc.js (100%) rename mobile/{android => shared}/components/extensions/ExtensionBrowsingData.sys.mjs (100%) rename mobile/{android => shared}/components/extensions/ext-android.js (100%) rename mobile/{android => shared}/components/extensions/ext-android.json (100%) rename mobile/{android => shared}/components/extensions/ext-browserAction.js (100%) rename mobile/{android => shared}/components/extensions/ext-c-android.js (100%) rename mobile/{android => shared}/components/extensions/ext-c-tabs.js (100%) rename mobile/{android => shared}/components/extensions/ext-downloads.js (100%) rename mobile/{android => shared}/components/extensions/ext-pageAction.js (100%) rename mobile/{android => shared}/components/extensions/ext-tabs.js (100%) rename mobile/{android => shared}/components/extensions/extensions-mobile.manifest (100%) rename mobile/{android => shared}/components/extensions/jar.mn (100%) rename mobile/{android => shared}/components/extensions/moz.build (100%) rename mobile/{android => shared}/components/extensions/schemas/LICENSE-CHROMIUM (100%) rename mobile/{android => shared}/components/extensions/schemas/README.md (100%) rename mobile/{android => shared}/components/extensions/schemas/gecko_view_addons.json (100%) rename mobile/{android => shared}/components/extensions/schemas/jar.mn (100%) rename mobile/{android => shared}/components/extensions/schemas/moz.build (100%) rename mobile/{android => shared}/components/extensions/schemas/tabs.json (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/.eslintrc.js (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/chrome.toml (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/context.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/context_tabs_onUpdated_iframe.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/context_tabs_onUpdated_page.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/file_bypass_cache.sjs (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/file_dummy.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/file_iframe_document.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/file_slowed_document.sjs (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/head.js (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/mochitest.toml (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_all_apis.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_downloads_event_page.html (97%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_options_ui.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tab_runtimeConnect.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_autoDiscardable.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_create.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_events.html (98%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_executeScript.html (98%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html (96%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html (97%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_get.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_getCurrent.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_goBack_goForward.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_insertCSS.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_lastAccessed.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html (93%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_query.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_reload.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html (96%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html (98%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_tabs_update_url.html (100%) rename mobile/{android => shared}/components/extensions/test/mochitest/test_ext_webNavigation_onCommitted.html (100%) rename mobile/{android => shared}/components/extensions/test/xpcshell/.eslintrc.js (100%) rename mobile/{android => shared}/components/extensions/test/xpcshell/head.js (100%) rename mobile/{android => shared}/components/extensions/test/xpcshell/test_ext_native_messaging_geckoview.js (100%) rename mobile/{android => shared}/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js (100%) rename mobile/{android => shared}/components/extensions/test/xpcshell/xpcshell.toml (100%) rename mobile/{android => shared}/components/geckoview/ColorPickerDelegate.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/FilePickerDelegate.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/GeckoView.manifest (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewHistory.cpp (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewHistory.h (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewPermission.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewPrompt.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewPrompter.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewPush.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/GeckoViewStartup.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/LoginStorageDelegate.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/PromptCollection.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/SessionStoreFunctions.sys.mjs (100%) rename mobile/{android => shared}/components/geckoview/ShareDelegate.sys.mjs (100%) create mode 100644 mobile/shared/components/geckoview/components.conf create mode 100644 mobile/shared/components/geckoview/moz.build create mode 100644 mobile/shared/components/moz.build rename mobile/{android => shared}/modules/dbg-browser-actors.js (100%) rename mobile/{android => shared}/modules/geckoview/BrowserUsageTelemetry.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/ChildCrashHandler.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/DelayedInit.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewActorChild.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewActorManager.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewActorParent.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewAutocomplete.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewAutofill.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewChildModule.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewClipboardPermission.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewConsole.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewContent.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewContentBlocking.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewIdentityCredential.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewMediaControl.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewModule.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewNavigation.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewProgress.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewPushController.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewRemoteDebugger.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewSelectionAction.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewSessionStore.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewSettings.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewStorageController.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewTab.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewTelemetry.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewTestUtils.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewTranslations.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewUtils.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/GeckoViewWebExtension.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/LoadURIDelegate.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/MediaUtils.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/Messaging.sys.mjs (100%) rename mobile/{android => shared}/modules/geckoview/metrics.yaml (100%) create mode 100644 mobile/shared/modules/geckoview/moz.build rename mobile/{android => shared}/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js (100%) rename mobile/{android => shared}/modules/geckoview/test/xpcshell/xpcshell.toml (100%) create mode 100644 mobile/shared/modules/moz.build rename mobile/{android => shared}/modules/test/AppUiTestDelegate.sys.mjs (100%) rename mobile/{android => shared}/modules/test/moz.build (100%) create mode 100644 mobile/shared/moz.build diff --git a/.eslintrc.js b/.eslintrc.js index ef0ab715a166..093c4a79edb8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -298,7 +298,7 @@ module.exports = { "devtools/shared/tests/xpcshell/test_console_filtering.js", "devtools/shared/webconsole/test/chrome/test_consoleapi_innerID.html", "dom/push/Push*.sys.mjs", - "mobile/android/modules/geckoview/GeckoViewUtils.sys.mjs", + "mobile/shared/modules/geckoview/GeckoViewUtils.sys.mjs", "remote/shared/**", "security/manager/ssl/RemoteSecuritySettings.sys.mjs", "services/**", @@ -358,9 +358,10 @@ module.exports = { "intl/locale/tests/unit/test_localeService.js", "layout/tools/layout-debug/LayoutDebugChild.sys.mjs", "layout/tools/reftest/reftest.sys.mjs", - "mobile/android/actors/**", - "mobile/android/components/geckoview/GeckoViewStartup.sys.mjs", "mobile/android/modules/geckoview/**", + "mobile/shared/actors/**", + "mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs", + "mobile/shared/modules/geckoview/**", "netwerk/test/browser/browser_test_data_channel_observer.js", "netwerk/test/unit/test_proxyconnect.js", "remote/**", @@ -435,8 +436,8 @@ module.exports = { "layout/style/test/property_database.js", "layout/style/test/test_computed_style_grid_with_pseudo.html", "layout/style/test/test_visited_reftests.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_events.html", "mobile/android/geckoview/src/androidTest/assets/www/getusermedia_xorigin_container.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_events.html", "modules/libjar/test/unit/test_fault_handler.js", "netwerk/test/httpserver/httpd.sys.mjs", "netwerk/test/unit/**", @@ -574,6 +575,7 @@ module.exports = { "js/xpconnect/**", "layout/**", "mobile/android/**", + "mobile/shared/**", "modules/**", "netwerk/**", "parser/htmlparser/**", @@ -709,6 +711,7 @@ module.exports = { "js/xpconnect/**", "layout/**", "mobile/android/**", + "mobile/shared/**", "modules/**", "netwerk/**", "parser/htmlparser/**", @@ -2073,13 +2076,13 @@ module.exports = { "layout/svg/tests/file_context_fill_fallback_red.html", "layout/svg/tests/test_embed_sizing.html", "layout/xul/test/test_bug386386.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_create.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_events.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_query.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html", - "mobile/android/components/extensions/test/mochitest/test_ext_tabs_update_url.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_create.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_events.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_query.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html", + "mobile/shared/components/extensions/test/mochitest/test_ext_tabs_update_url.html", "netwerk/cookie/test/browser/browser_cookies_ipv6.js", "netwerk/cookie/test/browser/browser_originattributes.js", "netwerk/cookie/test/browser/browser_oversize.js", diff --git a/.prettierignore b/.prettierignore index c9b7bb3730d6..11e3c43df8e1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -908,7 +908,6 @@ layout/tables/test/test_bug337124.html mobile/android/android-components/docs/_includes/footer.html mobile/android/android-components/docs/_includes/head.html mobile/android/android-components/docs/_layouts/home.html -mobile/android/components/extensions/test/mochitest/file_dummy.html mobile/android/fenix/app/src/androidTest/assets/pages/htmlControls.html mobile/android/fenix/app/src/androidTest/assets/pages/trackingPage.html mobile/android/geckoview/src/androidTest/assets/www/accessibility/test-headings.html @@ -917,6 +916,7 @@ mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html mobile/android/geckoview/src/androidTest/assets/www/context_menu_video.html mobile/android/geckoview/src/androidTest/assets/www/mp4.html mobile/android/geckoview/src/androidTest/assets/www/webm.html +mobile/shared/components/extensions/test/mochitest/file_dummy.html netwerk/test/browser/103_preload_iframe.html netwerk/test/browser/post.html netwerk/test/mochitests/file_domain_hierarchy_inner.html diff --git a/browser/modules/Sanitizer.sys.mjs b/browser/modules/Sanitizer.sys.mjs index 3b0f960d1886..490e3d0ab81d 100644 --- a/browser/modules/Sanitizer.sys.mjs +++ b/browser/modules/Sanitizer.sys.mjs @@ -457,7 +457,7 @@ export var Sanitizer = { // When making any changes to the sanitize implementations here, // please check whether the changes are applicable to Android - // (mobile/android/modules/geckoview/GeckoViewStorageController.sys.mjs) as well. + // (mobile/shared/modules/geckoview/GeckoViewStorageController.sys.mjs) as well. items: { cache: { diff --git a/dom/push/components.conf b/dom/push/components.conf index 6af27c15fb29..74651b1a230d 100644 --- a/dom/push/components.conf +++ b/dom/push/components.conf @@ -13,7 +13,7 @@ Classes = [ }, ] -if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android': +if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] not in ('android', 'uikit'): Classes += [ { 'cid': '{daaa8d73-677e-4233-8acd-2c404bd01658}', diff --git a/mobile/android/components/geckoview/components.conf b/mobile/android/components/geckoview/components.conf index 230abc5cf41e..94521f1c7248 100644 --- a/mobile/android/components/geckoview/components.conf +++ b/mobile/android/components/geckoview/components.conf @@ -5,68 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. Classes = [ - { - 'cid': '{3e30d2a0-9934-11ea-bb37-0242ac130002}', - 'contract_ids': ['@mozilla.org/embedcomp/prompt-collection;1'], - 'esModule': 'resource://gre/modules/PromptCollection.sys.mjs', - 'constructor': 'PromptCollection', - }, - { - 'js_name': 'prompt', - 'cid': '{076ac188-23c1-4390-aa08-7ef1f78ca5d9}', - 'contract_ids': [ - '@mozilla.org/prompter;1', - ], - 'interfaces': ['nsIPromptService'], - 'esModule': 'resource://gre/modules/GeckoViewPrompt.sys.mjs', - 'constructor': 'PromptFactory', - }, - { - 'cid': '{8e993c34-fdd6-432c-967e-f995d888777f}', - 'contract_ids': ['@mozilla.org/geckoview/startup;1'], - 'esModule': 'resource://gre/modules/GeckoViewStartup.sys.mjs', - 'constructor': 'GeckoViewStartup', - }, - { - 'cid': '{42f3c238-e8e8-4015-9ca2-148723a8afcf}', - 'contract_ids': ['@mozilla.org/content-permission/prompt;1'], - 'esModule': 'resource://gre/modules/GeckoViewPermission.sys.mjs', - 'constructor': 'GeckoViewPermission', - }, - { - 'cid': '{a54d84d7-98a4-4fec-b664-e42e512ae9cc}', - 'contract_ids': ['@mozilla.org/push/Service;1'], - 'esModule': 'resource://gre/modules/GeckoViewPush.sys.mjs', - 'constructor': 'PushService', - }, - { - 'cid': '{fc4bec74-ddd0-4ea8-9a66-9a5081258e32}', - 'contract_ids': ['@mozilla.org/parent/colorpicker;1'], - 'esModule': 'resource://gre/modules/ColorPickerDelegate.sys.mjs', - 'constructor': 'ColorPickerDelegate', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, - { - 'cid': '{25fdbae6-f684-4bf0-b773-ff2b7a6273c8}', - 'contract_ids': ['@mozilla.org/parent/filepicker;1'], - 'esModule': 'resource://gre/modules/FilePickerDelegate.sys.mjs', - 'constructor': 'FilePickerDelegate', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, - { - 'cid': '{1201d357-8417-4926-a694-e6408fbedcf8}', - 'contract_ids': ['@mozilla.org/sharepicker;1'], - 'esModule': 'resource://gre/modules/ShareDelegate.sys.mjs', - 'constructor': 'ShareDelegate', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, - { - 'cid': '{3d765750-1c3d-11ea-aaef-0800200c9a66}', - 'contract_ids': ['@mozilla.org/login-manager/prompter;1'], - 'esModule': 'resource://gre/modules/LoginStorageDelegate.sys.mjs', - 'constructor': 'LoginStorageDelegate', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, { 'cid': '{91455c77-64a1-4c37-be00-f94eb9c7b8e1}', 'contract_ids': [ @@ -91,23 +29,4 @@ Classes = [ ], }, }, - { - 'cid': '{ad643d9e-52e3-4385-a57c-b42deb2f5daf}', - 'contract_ids': ['@mozilla.org/toolkit/sessionstore-functions;1'], - 'esModule': 'resource://gre/modules/SessionStoreFunctions.sys.mjs', - 'constructor': 'SessionStoreFunctions', - }, ] - -if defined('MOZ_ANDROID_HISTORY'): - Classes += [ - { - 'name': 'History', - 'cid': '{0937a705-91a6-417a-8292-b22eb10da86c}', - 'contract_ids': ['@mozilla.org/browser/history;1'], - 'singleton': True, - 'type': 'GeckoViewHistory', - 'headers': ['GeckoViewHistory.h'], - 'constructor': 'GeckoViewHistory::GetSingleton', - }, - ] diff --git a/mobile/android/components/geckoview/moz.build b/mobile/android/components/geckoview/moz.build index 75b8c1bf327d..5a2663526a0d 100644 --- a/mobile/android/components/geckoview/moz.build +++ b/mobile/android/components/geckoview/moz.build @@ -22,35 +22,10 @@ EXPORTS += [ "GeckoViewStreamListener.h", ] -if CONFIG["MOZ_ANDROID_HISTORY"]: - EXPORTS += [ - "GeckoViewHistory.h", - ] - SOURCES += [ - "GeckoViewHistory.cpp", - ] - include("/ipc/chromium/chromium-config.mozbuild") +include("/ipc/chromium/chromium-config.mozbuild") XPCOM_MANIFESTS += [ "components.conf", ] -EXTRA_COMPONENTS += [ - "GeckoView.manifest", -] - -EXTRA_JS_MODULES += [ - "ColorPickerDelegate.sys.mjs", - "FilePickerDelegate.sys.mjs", - "GeckoViewPermission.sys.mjs", - "GeckoViewPrompt.sys.mjs", - "GeckoViewPrompter.sys.mjs", - "GeckoViewPush.sys.mjs", - "GeckoViewStartup.sys.mjs", - "LoginStorageDelegate.sys.mjs", - "PromptCollection.sys.mjs", - "SessionStoreFunctions.sys.mjs", - "ShareDelegate.sys.mjs", -] - FINAL_LIBRARY = "xul" diff --git a/mobile/android/components/moz.build b/mobile/android/components/moz.build index a6300de34958..7b81c01e717f 100644 --- a/mobile/android/components/moz.build +++ b/mobile/android/components/moz.build @@ -7,10 +7,6 @@ with Files("**"): BUG_COMPONENT = ("GeckoView", "General") -with Files("extensions/**"): - BUG_COMPONENT = ("WebExtensions", "Android") - DIRS += [ - "extensions", "geckoview", ] diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn index 98cbaf6668f0..4a4b7ad1abc7 100644 --- a/mobile/android/locales/jar.mn +++ b/mobile/android/locales/jar.mn @@ -4,7 +4,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Note: This file should only contain locale entries. All -# override and resource entries should go to mobile/android/chrome/jar.mn to avoid +# override and resource entries should go to mobile/shared/chrome/jar.mn to avoid # having to create the same entry for each locale. # Fluent files diff --git a/mobile/android/modules/geckoview/moz.build b/mobile/android/modules/geckoview/moz.build index 9c2693c85e9b..db4094f4e959 100644 --- a/mobile/android/modules/geckoview/moz.build +++ b/mobile/android/modules/geckoview/moz.build @@ -6,40 +6,4 @@ EXTRA_JS_MODULES += [ "AndroidLog.sys.mjs", - "BrowserUsageTelemetry.sys.mjs", - "ChildCrashHandler.sys.mjs", - "DelayedInit.sys.mjs", - "GeckoViewActorChild.sys.mjs", - "GeckoViewActorManager.sys.mjs", - "GeckoViewActorParent.sys.mjs", - "GeckoViewAutocomplete.sys.mjs", - "GeckoViewAutofill.sys.mjs", - "GeckoViewChildModule.sys.mjs", - "GeckoViewClipboardPermission.sys.mjs", - "GeckoViewConsole.sys.mjs", - "GeckoViewContent.sys.mjs", - "GeckoViewContentBlocking.sys.mjs", - "GeckoViewIdentityCredential.sys.mjs", - "GeckoViewMediaControl.sys.mjs", - "GeckoViewModule.sys.mjs", - "GeckoViewNavigation.sys.mjs", - "GeckoViewProcessHangMonitor.sys.mjs", - "GeckoViewProgress.sys.mjs", - "GeckoViewPushController.sys.mjs", - "GeckoViewRemoteDebugger.sys.mjs", - "GeckoViewSelectionAction.sys.mjs", - "GeckoViewSessionStore.sys.mjs", - "GeckoViewSettings.sys.mjs", - "GeckoViewStorageController.sys.mjs", - "GeckoViewTab.sys.mjs", - "GeckoViewTelemetry.sys.mjs", - "GeckoViewTestUtils.sys.mjs", - "GeckoViewTranslations.sys.mjs", - "GeckoViewUtils.sys.mjs", - "GeckoViewWebExtension.sys.mjs", - "LoadURIDelegate.sys.mjs", - "MediaUtils.sys.mjs", - "Messaging.sys.mjs", ] - -XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"] diff --git a/mobile/android/modules/moz.build b/mobile/android/modules/moz.build index 52db19075d4e..4d24e07d0360 100644 --- a/mobile/android/modules/moz.build +++ b/mobile/android/modules/moz.build @@ -10,9 +10,4 @@ with Files("**"): DIRS += [ "geckoview", - "test", -] - -EXTRA_JS_MODULES += [ - "dbg-browser-actors.js", ] diff --git a/mobile/android/moz.build b/mobile/android/moz.build index 48d52d9bffaf..a468090e263e 100644 --- a/mobile/android/moz.build +++ b/mobile/android/moz.build @@ -75,8 +75,7 @@ DIRS += [ ] DIRS += [ - "actors", - "chrome", + "../shared", "components", "modules", "themes/geckoview", diff --git a/mobile/android/test_runner/src/main/assets/test-runner-support/manifest.json b/mobile/android/test_runner/src/main/assets/test-runner-support/manifest.json index 3d68643af9ad..9175eb4264f6 100644 --- a/mobile/android/test_runner/src/main/assets/test-runner-support/manifest.json +++ b/mobile/android/test_runner/src/main/assets/test-runner-support/manifest.json @@ -7,5 +7,5 @@ "id": "test-runner-support@tests.mozilla.org" } }, - "description": "This extension pretends to be the sender of native messages from tests. See mobile/android/modules/test/AppUiTestDelegate.sys.mjs for actual usage." + "description": "This extension pretends to be the sender of native messages from tests. See mobile/shared/modules/test/AppUiTestDelegate.sys.mjs for actual usage." } diff --git a/mobile/android/test_runner/src/main/java/org/mozilla/geckoview/test_runner/TestRunnerApiEngine.java b/mobile/android/test_runner/src/main/java/org/mozilla/geckoview/test_runner/TestRunnerApiEngine.java index c6b8e797da70..75af1fb9c16b 100644 --- a/mobile/android/test_runner/src/main/java/org/mozilla/geckoview/test_runner/TestRunnerApiEngine.java +++ b/mobile/android/test_runner/src/main/java/org/mozilla/geckoview/test_runner/TestRunnerApiEngine.java @@ -11,7 +11,7 @@ import org.json.JSONObject; import org.mozilla.geckoview.GeckoResult; import org.mozilla.geckoview.WebExtension; -// Receives API calls via mobile/android/modules/test/AppUiTestDelegate.sys.mjs +// Receives API calls via mobile/shared/modules/test/AppUiTestDelegate.sys.mjs // and forwards the calls to the Api impl. // // This interface allows JS/HTML-based mochitests to invoke test-only logic diff --git a/mobile/ios/moz.build b/mobile/ios/moz.build index 88a2ef2a6d5a..425159837364 100644 --- a/mobile/ios/moz.build +++ b/mobile/ios/moz.build @@ -9,3 +9,7 @@ CONFIGURE_SUBST_FILES += ["installer/Makefile"] with Files("**"): BUG_COMPONENT = ("Core", "General") SCHEDULES.exclusive = ["ios"] + +DIRS += [ + "../shared", +] diff --git a/mobile/shared/.eslintrc.js b/mobile/shared/.eslintrc.js new file mode 100644 index 000000000000..05a1def15412 --- /dev/null +++ b/mobile/shared/.eslintrc.js @@ -0,0 +1,73 @@ +/* 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/. */ + +"use strict"; + +const { + globals, +} = require("../../toolkit/components/extensions/parent/.eslintrc.js"); + +module.exports = { + overrides: [ + { + files: ["components/extensions/ext-*.js"], + excludedFiles: ["components/extensions/ext-c-*.js"], + globals: { + ...globals, + // These globals are defined in ext-android.js and can only be used in + // the extension files that run in the parent process. + EventDispatcher: true, + ExtensionError: true, + makeGlobalEvent: true, + TabContext: true, + tabTracker: true, + windowTracker: true, + }, + }, + { + files: [ + "chrome/geckoview/**", + "components/geckoview/**", + "modules/geckoview/**", + "actors/**", + ], + rules: { + "no-unused-vars": [ + "error", + { + args: "none", + vars: "local", + varsIgnorePattern: "(debug|warn)", + }, + ], + "no-restricted-syntax": [ + "error", + { + selector: `CallExpression > \ + Identifier.callee[name = /^debug$|^warn$/]`, + message: + "Use debug and warn with template literals, e.g. debug `foo`;", + }, + { + selector: `BinaryExpression[operator = '+'] > \ + TaggedTemplateExpression.left > \ + Identifier.tag[name = /^debug$|^warn$/]`, + message: + "Use only one template literal with debug/warn instead of concatenating multiple expressions,\n" + + " e.g. (debug `foo ${42} bar`) instead of (debug `foo` + 42 + `bar`)", + }, + { + selector: `TaggedTemplateExpression[tag.type = 'Identifier'][tag.name = /^debug$|^warn$/] > \ + TemplateLiteral.quasi CallExpression > \ + MemberExpression.callee[object.type = 'Identifier'][object.name = 'JSON'] > \ + Identifier.property[name = 'stringify']`, + message: + "Don't call JSON.stringify within debug/warn literals,\n" + + " e.g. (debug `foo=${foo}`) instead of (debug `foo=${JSON.stringify(foo)}`)", + }, + ], + }, + }, + ], +}; diff --git a/mobile/android/actors/ContentDelegateChild.sys.mjs b/mobile/shared/actors/ContentDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/ContentDelegateChild.sys.mjs rename to mobile/shared/actors/ContentDelegateChild.sys.mjs diff --git a/mobile/android/actors/ContentDelegateParent.sys.mjs b/mobile/shared/actors/ContentDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/ContentDelegateParent.sys.mjs rename to mobile/shared/actors/ContentDelegateParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewAutoFillChild.sys.mjs b/mobile/shared/actors/GeckoViewAutoFillChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewAutoFillChild.sys.mjs rename to mobile/shared/actors/GeckoViewAutoFillChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewAutoFillParent.sys.mjs b/mobile/shared/actors/GeckoViewAutoFillParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewAutoFillParent.sys.mjs rename to mobile/shared/actors/GeckoViewAutoFillParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewContentChild.sys.mjs b/mobile/shared/actors/GeckoViewContentChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewContentChild.sys.mjs rename to mobile/shared/actors/GeckoViewContentChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewContentParent.sys.mjs b/mobile/shared/actors/GeckoViewContentParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewContentParent.sys.mjs rename to mobile/shared/actors/GeckoViewContentParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewExperimentDelegateParent.sys.mjs b/mobile/shared/actors/GeckoViewExperimentDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewExperimentDelegateParent.sys.mjs rename to mobile/shared/actors/GeckoViewExperimentDelegateParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewFormValidationChild.sys.mjs b/mobile/shared/actors/GeckoViewFormValidationChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewFormValidationChild.sys.mjs rename to mobile/shared/actors/GeckoViewFormValidationChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPermissionChild.sys.mjs b/mobile/shared/actors/GeckoViewPermissionChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPermissionChild.sys.mjs rename to mobile/shared/actors/GeckoViewPermissionChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPermissionParent.sys.mjs b/mobile/shared/actors/GeckoViewPermissionParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPermissionParent.sys.mjs rename to mobile/shared/actors/GeckoViewPermissionParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewPermissionProcessChild.sys.mjs b/mobile/shared/actors/GeckoViewPermissionProcessChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPermissionProcessChild.sys.mjs rename to mobile/shared/actors/GeckoViewPermissionProcessChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPermissionProcessParent.sys.mjs b/mobile/shared/actors/GeckoViewPermissionProcessParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPermissionProcessParent.sys.mjs rename to mobile/shared/actors/GeckoViewPermissionProcessParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewPrintDelegateChild.sys.mjs b/mobile/shared/actors/GeckoViewPrintDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPrintDelegateChild.sys.mjs rename to mobile/shared/actors/GeckoViewPrintDelegateChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPrintDelegateParent.sys.mjs b/mobile/shared/actors/GeckoViewPrintDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPrintDelegateParent.sys.mjs rename to mobile/shared/actors/GeckoViewPrintDelegateParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewPromptChild.sys.mjs b/mobile/shared/actors/GeckoViewPromptChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPromptChild.sys.mjs rename to mobile/shared/actors/GeckoViewPromptChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPrompterChild.sys.mjs b/mobile/shared/actors/GeckoViewPrompterChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPrompterChild.sys.mjs rename to mobile/shared/actors/GeckoViewPrompterChild.sys.mjs diff --git a/mobile/android/actors/GeckoViewPrompterParent.sys.mjs b/mobile/shared/actors/GeckoViewPrompterParent.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewPrompterParent.sys.mjs rename to mobile/shared/actors/GeckoViewPrompterParent.sys.mjs diff --git a/mobile/android/actors/GeckoViewSettingsChild.sys.mjs b/mobile/shared/actors/GeckoViewSettingsChild.sys.mjs similarity index 100% rename from mobile/android/actors/GeckoViewSettingsChild.sys.mjs rename to mobile/shared/actors/GeckoViewSettingsChild.sys.mjs diff --git a/mobile/android/actors/LoadURIDelegateChild.sys.mjs b/mobile/shared/actors/LoadURIDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/LoadURIDelegateChild.sys.mjs rename to mobile/shared/actors/LoadURIDelegateChild.sys.mjs diff --git a/mobile/android/actors/LoadURIDelegateParent.sys.mjs b/mobile/shared/actors/LoadURIDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/LoadURIDelegateParent.sys.mjs rename to mobile/shared/actors/LoadURIDelegateParent.sys.mjs diff --git a/mobile/android/actors/MediaControlDelegateChild.sys.mjs b/mobile/shared/actors/MediaControlDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/MediaControlDelegateChild.sys.mjs rename to mobile/shared/actors/MediaControlDelegateChild.sys.mjs diff --git a/mobile/android/actors/MediaControlDelegateParent.sys.mjs b/mobile/shared/actors/MediaControlDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/MediaControlDelegateParent.sys.mjs rename to mobile/shared/actors/MediaControlDelegateParent.sys.mjs diff --git a/mobile/android/actors/ProgressDelegateChild.sys.mjs b/mobile/shared/actors/ProgressDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/ProgressDelegateChild.sys.mjs rename to mobile/shared/actors/ProgressDelegateChild.sys.mjs diff --git a/mobile/android/actors/ProgressDelegateParent.sys.mjs b/mobile/shared/actors/ProgressDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/ProgressDelegateParent.sys.mjs rename to mobile/shared/actors/ProgressDelegateParent.sys.mjs diff --git a/mobile/android/actors/ScrollDelegateChild.sys.mjs b/mobile/shared/actors/ScrollDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/ScrollDelegateChild.sys.mjs rename to mobile/shared/actors/ScrollDelegateChild.sys.mjs diff --git a/mobile/android/actors/ScrollDelegateParent.sys.mjs b/mobile/shared/actors/ScrollDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/ScrollDelegateParent.sys.mjs rename to mobile/shared/actors/ScrollDelegateParent.sys.mjs diff --git a/mobile/android/actors/SelectionActionDelegateChild.sys.mjs b/mobile/shared/actors/SelectionActionDelegateChild.sys.mjs similarity index 100% rename from mobile/android/actors/SelectionActionDelegateChild.sys.mjs rename to mobile/shared/actors/SelectionActionDelegateChild.sys.mjs diff --git a/mobile/android/actors/SelectionActionDelegateParent.sys.mjs b/mobile/shared/actors/SelectionActionDelegateParent.sys.mjs similarity index 100% rename from mobile/android/actors/SelectionActionDelegateParent.sys.mjs rename to mobile/shared/actors/SelectionActionDelegateParent.sys.mjs diff --git a/mobile/android/actors/metrics.yaml b/mobile/shared/actors/metrics.yaml similarity index 100% rename from mobile/android/actors/metrics.yaml rename to mobile/shared/actors/metrics.yaml diff --git a/mobile/android/actors/moz.build b/mobile/shared/actors/moz.build similarity index 100% rename from mobile/android/actors/moz.build rename to mobile/shared/actors/moz.build diff --git a/mobile/android/actors/tests/mochitests/head.js b/mobile/shared/actors/tests/mochitests/head.js similarity index 100% rename from mobile/android/actors/tests/mochitests/head.js rename to mobile/shared/actors/tests/mochitests/head.js diff --git a/mobile/android/actors/tests/mochitests/mochitest.toml b/mobile/shared/actors/tests/mochitests/mochitest.toml similarity index 100% rename from mobile/android/actors/tests/mochitests/mochitest.toml rename to mobile/shared/actors/tests/mochitests/mochitest.toml diff --git a/mobile/android/actors/tests/mochitests/test_geckoview_experiment_delegate.html b/mobile/shared/actors/tests/mochitests/test_geckoview_experiment_delegate.html similarity index 100% rename from mobile/android/actors/tests/mochitests/test_geckoview_experiment_delegate.html rename to mobile/shared/actors/tests/mochitests/test_geckoview_experiment_delegate.html diff --git a/mobile/android/chrome/geckoview/SessionStateAggregator.js b/mobile/shared/chrome/geckoview/SessionStateAggregator.js similarity index 100% rename from mobile/android/chrome/geckoview/SessionStateAggregator.js rename to mobile/shared/chrome/geckoview/SessionStateAggregator.js diff --git a/mobile/android/chrome/geckoview/config.js b/mobile/shared/chrome/geckoview/config.js similarity index 100% rename from mobile/android/chrome/geckoview/config.js rename to mobile/shared/chrome/geckoview/config.js diff --git a/mobile/android/chrome/geckoview/config.xhtml b/mobile/shared/chrome/geckoview/config.xhtml similarity index 100% rename from mobile/android/chrome/geckoview/config.xhtml rename to mobile/shared/chrome/geckoview/config.xhtml diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/shared/chrome/geckoview/geckoview.js similarity index 100% rename from mobile/android/chrome/geckoview/geckoview.js rename to mobile/shared/chrome/geckoview/geckoview.js diff --git a/mobile/android/chrome/geckoview/geckoview.xhtml b/mobile/shared/chrome/geckoview/geckoview.xhtml similarity index 100% rename from mobile/android/chrome/geckoview/geckoview.xhtml rename to mobile/shared/chrome/geckoview/geckoview.xhtml diff --git a/mobile/android/chrome/geckoview/jar.mn b/mobile/shared/chrome/geckoview/jar.mn similarity index 100% rename from mobile/android/chrome/geckoview/jar.mn rename to mobile/shared/chrome/geckoview/jar.mn diff --git a/mobile/android/chrome/geckoview/moz.build b/mobile/shared/chrome/geckoview/moz.build similarity index 100% rename from mobile/android/chrome/geckoview/moz.build rename to mobile/shared/chrome/geckoview/moz.build diff --git a/mobile/android/chrome/moz.build b/mobile/shared/chrome/moz.build similarity index 100% rename from mobile/android/chrome/moz.build rename to mobile/shared/chrome/moz.build diff --git a/mobile/android/components/extensions/.eslintrc.js b/mobile/shared/components/extensions/.eslintrc.js similarity index 100% rename from mobile/android/components/extensions/.eslintrc.js rename to mobile/shared/components/extensions/.eslintrc.js diff --git a/mobile/android/components/extensions/ExtensionBrowsingData.sys.mjs b/mobile/shared/components/extensions/ExtensionBrowsingData.sys.mjs similarity index 100% rename from mobile/android/components/extensions/ExtensionBrowsingData.sys.mjs rename to mobile/shared/components/extensions/ExtensionBrowsingData.sys.mjs diff --git a/mobile/android/components/extensions/ext-android.js b/mobile/shared/components/extensions/ext-android.js similarity index 100% rename from mobile/android/components/extensions/ext-android.js rename to mobile/shared/components/extensions/ext-android.js diff --git a/mobile/android/components/extensions/ext-android.json b/mobile/shared/components/extensions/ext-android.json similarity index 100% rename from mobile/android/components/extensions/ext-android.json rename to mobile/shared/components/extensions/ext-android.json diff --git a/mobile/android/components/extensions/ext-browserAction.js b/mobile/shared/components/extensions/ext-browserAction.js similarity index 100% rename from mobile/android/components/extensions/ext-browserAction.js rename to mobile/shared/components/extensions/ext-browserAction.js diff --git a/mobile/android/components/extensions/ext-c-android.js b/mobile/shared/components/extensions/ext-c-android.js similarity index 100% rename from mobile/android/components/extensions/ext-c-android.js rename to mobile/shared/components/extensions/ext-c-android.js diff --git a/mobile/android/components/extensions/ext-c-tabs.js b/mobile/shared/components/extensions/ext-c-tabs.js similarity index 100% rename from mobile/android/components/extensions/ext-c-tabs.js rename to mobile/shared/components/extensions/ext-c-tabs.js diff --git a/mobile/android/components/extensions/ext-downloads.js b/mobile/shared/components/extensions/ext-downloads.js similarity index 100% rename from mobile/android/components/extensions/ext-downloads.js rename to mobile/shared/components/extensions/ext-downloads.js diff --git a/mobile/android/components/extensions/ext-pageAction.js b/mobile/shared/components/extensions/ext-pageAction.js similarity index 100% rename from mobile/android/components/extensions/ext-pageAction.js rename to mobile/shared/components/extensions/ext-pageAction.js diff --git a/mobile/android/components/extensions/ext-tabs.js b/mobile/shared/components/extensions/ext-tabs.js similarity index 100% rename from mobile/android/components/extensions/ext-tabs.js rename to mobile/shared/components/extensions/ext-tabs.js diff --git a/mobile/android/components/extensions/extensions-mobile.manifest b/mobile/shared/components/extensions/extensions-mobile.manifest similarity index 100% rename from mobile/android/components/extensions/extensions-mobile.manifest rename to mobile/shared/components/extensions/extensions-mobile.manifest diff --git a/mobile/android/components/extensions/jar.mn b/mobile/shared/components/extensions/jar.mn similarity index 100% rename from mobile/android/components/extensions/jar.mn rename to mobile/shared/components/extensions/jar.mn diff --git a/mobile/android/components/extensions/moz.build b/mobile/shared/components/extensions/moz.build similarity index 100% rename from mobile/android/components/extensions/moz.build rename to mobile/shared/components/extensions/moz.build diff --git a/mobile/android/components/extensions/schemas/LICENSE-CHROMIUM b/mobile/shared/components/extensions/schemas/LICENSE-CHROMIUM similarity index 100% rename from mobile/android/components/extensions/schemas/LICENSE-CHROMIUM rename to mobile/shared/components/extensions/schemas/LICENSE-CHROMIUM diff --git a/mobile/android/components/extensions/schemas/README.md b/mobile/shared/components/extensions/schemas/README.md similarity index 100% rename from mobile/android/components/extensions/schemas/README.md rename to mobile/shared/components/extensions/schemas/README.md diff --git a/mobile/android/components/extensions/schemas/gecko_view_addons.json b/mobile/shared/components/extensions/schemas/gecko_view_addons.json similarity index 100% rename from mobile/android/components/extensions/schemas/gecko_view_addons.json rename to mobile/shared/components/extensions/schemas/gecko_view_addons.json diff --git a/mobile/android/components/extensions/schemas/jar.mn b/mobile/shared/components/extensions/schemas/jar.mn similarity index 100% rename from mobile/android/components/extensions/schemas/jar.mn rename to mobile/shared/components/extensions/schemas/jar.mn diff --git a/mobile/android/components/extensions/schemas/moz.build b/mobile/shared/components/extensions/schemas/moz.build similarity index 100% rename from mobile/android/components/extensions/schemas/moz.build rename to mobile/shared/components/extensions/schemas/moz.build diff --git a/mobile/android/components/extensions/schemas/tabs.json b/mobile/shared/components/extensions/schemas/tabs.json similarity index 100% rename from mobile/android/components/extensions/schemas/tabs.json rename to mobile/shared/components/extensions/schemas/tabs.json diff --git a/mobile/android/components/extensions/test/mochitest/.eslintrc.js b/mobile/shared/components/extensions/test/mochitest/.eslintrc.js similarity index 100% rename from mobile/android/components/extensions/test/mochitest/.eslintrc.js rename to mobile/shared/components/extensions/test/mochitest/.eslintrc.js diff --git a/mobile/android/components/extensions/test/mochitest/chrome.toml b/mobile/shared/components/extensions/test/mochitest/chrome.toml similarity index 100% rename from mobile/android/components/extensions/test/mochitest/chrome.toml rename to mobile/shared/components/extensions/test/mochitest/chrome.toml diff --git a/mobile/android/components/extensions/test/mochitest/context.html b/mobile/shared/components/extensions/test/mochitest/context.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/context.html rename to mobile/shared/components/extensions/test/mochitest/context.html diff --git a/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_iframe.html b/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_iframe.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_iframe.html rename to mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_iframe.html diff --git a/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html b/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html rename to mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html diff --git a/mobile/android/components/extensions/test/mochitest/file_bypass_cache.sjs b/mobile/shared/components/extensions/test/mochitest/file_bypass_cache.sjs similarity index 100% rename from mobile/android/components/extensions/test/mochitest/file_bypass_cache.sjs rename to mobile/shared/components/extensions/test/mochitest/file_bypass_cache.sjs diff --git a/mobile/android/components/extensions/test/mochitest/file_dummy.html b/mobile/shared/components/extensions/test/mochitest/file_dummy.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/file_dummy.html rename to mobile/shared/components/extensions/test/mochitest/file_dummy.html diff --git a/mobile/android/components/extensions/test/mochitest/file_iframe_document.html b/mobile/shared/components/extensions/test/mochitest/file_iframe_document.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/file_iframe_document.html rename to mobile/shared/components/extensions/test/mochitest/file_iframe_document.html diff --git a/mobile/android/components/extensions/test/mochitest/file_slowed_document.sjs b/mobile/shared/components/extensions/test/mochitest/file_slowed_document.sjs similarity index 100% rename from mobile/android/components/extensions/test/mochitest/file_slowed_document.sjs rename to mobile/shared/components/extensions/test/mochitest/file_slowed_document.sjs diff --git a/mobile/android/components/extensions/test/mochitest/head.js b/mobile/shared/components/extensions/test/mochitest/head.js similarity index 100% rename from mobile/android/components/extensions/test/mochitest/head.js rename to mobile/shared/components/extensions/test/mochitest/head.js diff --git a/mobile/android/components/extensions/test/mochitest/mochitest.toml b/mobile/shared/components/extensions/test/mochitest/mochitest.toml similarity index 100% rename from mobile/android/components/extensions/test/mochitest/mochitest.toml rename to mobile/shared/components/extensions/test/mochitest/mochitest.toml diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_all_apis.html b/mobile/shared/components/extensions/test/mochitest/test_ext_all_apis.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_all_apis.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_all_apis.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_downloads_event_page.html b/mobile/shared/components/extensions/test/mochitest/test_ext_downloads_event_page.html similarity index 97% rename from mobile/android/components/extensions/test/mochitest/test_ext_downloads_event_page.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_downloads_event_page.html index 78691114dfa7..2ecca2cdfa99 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_downloads_event_page.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_downloads_event_page.html @@ -57,7 +57,7 @@ add_task(async function test_downloads_event_page() { totalBytes: 5, }; - // Mocks DownloadItem from mobile/android/components/extensions/ext-downloads.js + // Mocks DownloadItem from mobile/shared/components/extensions/ext-downloads.js const downloadItem = { byExtensionId: "download-onChanged@tests.mozilla.org", byExtensionName: "Download", diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_options_ui.html b/mobile/shared/components/extensions/test/mochitest/test_ext_options_ui.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_options_ui.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_options_ui.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tab_runtimeConnect.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tab_runtimeConnect.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tab_runtimeConnect.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tab_runtimeConnect.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_autoDiscardable.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_autoDiscardable.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_autoDiscardable.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_autoDiscardable.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_create.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_create.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_create.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_create.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_events.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_events.html similarity index 98% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_events.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_events.html index 19aaf07f92de..656c227bbdff 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_events.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_events.html @@ -126,7 +126,7 @@ add_task(async function testTabRemovalEvent() { }); try { - const url = "http://example.com/mochitest/mobile/android/components/extensions/test/mochitest/context.html"; + const url = "http://example.com/mochitest/mobile/shared/components/extensions/test/mochitest/context.html"; const tab = await browser.tabs.create({url: url}); await awaitLoad(tab.id); diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript.html similarity index 98% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript.html index ab722f48d731..fcb031769258 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript.html @@ -17,7 +17,7 @@ add_task(async function testExecuteScript() { await SpecialPowers.pushPrefEnv({ set: [["dom.security.https_first", false]], }); - const BASE = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/"; + const BASE = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/"; const URL = BASE + "file_iframe_document.html"; const win = window.open(URL); diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_bad.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html similarity index 96% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html index fa2556861933..244ff023e03e 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_no_create.html @@ -14,7 +14,7 @@ "use strict"; add_task(async function testExecuteScriptAtOnUpdated() { - const BASE = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/"; + const BASE = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/"; const URL = BASE + "file_iframe_document.html"; // This is a regression test for bug 1325830. // The bug (executeScript not completing any more) occurred when executeScript diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html similarity index 97% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html index 2e82320f8c5b..7fcf9751758f 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_executeScript_runAt.html @@ -31,7 +31,7 @@ add_task(async function testExecuteScript() { async function background(DEBUG) { let tab; - const BASE = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/"; + const BASE = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/"; const URL = BASE + "file_slowed_document.sjs"; const MAX_TRIES = 30; diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_get.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_get.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_get.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_get.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_getCurrent.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_getCurrent.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_getCurrent.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_getCurrent.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_goBack_goForward.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_goBack_goForward.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_goBack_goForward.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_goBack_goForward.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_insertCSS.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_insertCSS.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_insertCSS.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_insertCSS.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_lastAccessed.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_lastAccessed.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_lastAccessed.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_lastAccessed.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html similarity index 93% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html index 1ec815c8c791..48b91662efa7 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_onUpdated.html @@ -25,7 +25,7 @@ add_task(async function test_onUpdated() { }, background: function() { - const pageURL = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; + const pageURL = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; const expectedSequence = [ {status: "loading"}, @@ -135,7 +135,7 @@ add_task(async function test_url() { add_task(async function test_title() { await do_test_update(async function background() { - const url = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; + const url = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; const tab = await browser.tabs.create({url}); browser.tabs.onUpdated.addListener(async function onUpdated(tabId, changeInfo) { @@ -155,7 +155,7 @@ add_task(async function test_title() { add_task(async function test_without_tabs_permission() { await do_test_update(async function background() { - const url = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; + const url = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; const tab = await browser.tabs.create({url}); let count = 0; diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_query.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_query.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_query.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_query.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_reload.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_reload.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_reload.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_reload.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html similarity index 96% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html index 87f90ad855e4..d57ee3824763 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_reload_bypass_cache.html @@ -20,7 +20,7 @@ add_task(async function() { }, async background() { - const BASE = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/"; + const BASE = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/"; const URL = BASE + "file_bypass_cache.sjs"; let tabId = null; diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html similarity index 98% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html index 4709fbe31cd7..dae939174c10 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html +++ b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html @@ -249,7 +249,7 @@ add_task(async function tabsSendMessageNoExceptionOnNonExistentTab() { }, async background() { - const url = "http://example.com/mochitest/tests/mobile/android/components/extensions/test/mochitest/file_dummy.html"; + const url = "http://example.com/mochitest/tests/mobile/shared/components/extensions/test/mochitest/file_dummy.html"; const tab = await browser.tabs.create({url}); try { diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_update_url.html b/mobile/shared/components/extensions/test/mochitest/test_ext_tabs_update_url.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_tabs_update_url.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_tabs_update_url.html diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_webNavigation_onCommitted.html b/mobile/shared/components/extensions/test/mochitest/test_ext_webNavigation_onCommitted.html similarity index 100% rename from mobile/android/components/extensions/test/mochitest/test_ext_webNavigation_onCommitted.html rename to mobile/shared/components/extensions/test/mochitest/test_ext_webNavigation_onCommitted.html diff --git a/mobile/android/components/extensions/test/xpcshell/.eslintrc.js b/mobile/shared/components/extensions/test/xpcshell/.eslintrc.js similarity index 100% rename from mobile/android/components/extensions/test/xpcshell/.eslintrc.js rename to mobile/shared/components/extensions/test/xpcshell/.eslintrc.js diff --git a/mobile/android/components/extensions/test/xpcshell/head.js b/mobile/shared/components/extensions/test/xpcshell/head.js similarity index 100% rename from mobile/android/components/extensions/test/xpcshell/head.js rename to mobile/shared/components/extensions/test/xpcshell/head.js diff --git a/mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_geckoview.js b/mobile/shared/components/extensions/test/xpcshell/test_ext_native_messaging_geckoview.js similarity index 100% rename from mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_geckoview.js rename to mobile/shared/components/extensions/test/xpcshell/test_ext_native_messaging_geckoview.js diff --git a/mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js b/mobile/shared/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js similarity index 100% rename from mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js rename to mobile/shared/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js diff --git a/mobile/android/components/extensions/test/xpcshell/xpcshell.toml b/mobile/shared/components/extensions/test/xpcshell/xpcshell.toml similarity index 100% rename from mobile/android/components/extensions/test/xpcshell/xpcshell.toml rename to mobile/shared/components/extensions/test/xpcshell/xpcshell.toml diff --git a/mobile/android/components/geckoview/ColorPickerDelegate.sys.mjs b/mobile/shared/components/geckoview/ColorPickerDelegate.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/ColorPickerDelegate.sys.mjs rename to mobile/shared/components/geckoview/ColorPickerDelegate.sys.mjs diff --git a/mobile/android/components/geckoview/FilePickerDelegate.sys.mjs b/mobile/shared/components/geckoview/FilePickerDelegate.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/FilePickerDelegate.sys.mjs rename to mobile/shared/components/geckoview/FilePickerDelegate.sys.mjs diff --git a/mobile/android/components/geckoview/GeckoView.manifest b/mobile/shared/components/geckoview/GeckoView.manifest similarity index 100% rename from mobile/android/components/geckoview/GeckoView.manifest rename to mobile/shared/components/geckoview/GeckoView.manifest diff --git a/mobile/android/components/geckoview/GeckoViewHistory.cpp b/mobile/shared/components/geckoview/GeckoViewHistory.cpp similarity index 100% rename from mobile/android/components/geckoview/GeckoViewHistory.cpp rename to mobile/shared/components/geckoview/GeckoViewHistory.cpp diff --git a/mobile/android/components/geckoview/GeckoViewHistory.h b/mobile/shared/components/geckoview/GeckoViewHistory.h similarity index 100% rename from mobile/android/components/geckoview/GeckoViewHistory.h rename to mobile/shared/components/geckoview/GeckoViewHistory.h diff --git a/mobile/android/components/geckoview/GeckoViewPermission.sys.mjs b/mobile/shared/components/geckoview/GeckoViewPermission.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/GeckoViewPermission.sys.mjs rename to mobile/shared/components/geckoview/GeckoViewPermission.sys.mjs diff --git a/mobile/android/components/geckoview/GeckoViewPrompt.sys.mjs b/mobile/shared/components/geckoview/GeckoViewPrompt.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/GeckoViewPrompt.sys.mjs rename to mobile/shared/components/geckoview/GeckoViewPrompt.sys.mjs diff --git a/mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs b/mobile/shared/components/geckoview/GeckoViewPrompter.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/GeckoViewPrompter.sys.mjs rename to mobile/shared/components/geckoview/GeckoViewPrompter.sys.mjs diff --git a/mobile/android/components/geckoview/GeckoViewPush.sys.mjs b/mobile/shared/components/geckoview/GeckoViewPush.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/GeckoViewPush.sys.mjs rename to mobile/shared/components/geckoview/GeckoViewPush.sys.mjs diff --git a/mobile/android/components/geckoview/GeckoViewStartup.sys.mjs b/mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/GeckoViewStartup.sys.mjs rename to mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs diff --git a/mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs b/mobile/shared/components/geckoview/LoginStorageDelegate.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/LoginStorageDelegate.sys.mjs rename to mobile/shared/components/geckoview/LoginStorageDelegate.sys.mjs diff --git a/mobile/android/components/geckoview/PromptCollection.sys.mjs b/mobile/shared/components/geckoview/PromptCollection.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/PromptCollection.sys.mjs rename to mobile/shared/components/geckoview/PromptCollection.sys.mjs diff --git a/mobile/android/components/geckoview/SessionStoreFunctions.sys.mjs b/mobile/shared/components/geckoview/SessionStoreFunctions.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/SessionStoreFunctions.sys.mjs rename to mobile/shared/components/geckoview/SessionStoreFunctions.sys.mjs diff --git a/mobile/android/components/geckoview/ShareDelegate.sys.mjs b/mobile/shared/components/geckoview/ShareDelegate.sys.mjs similarity index 100% rename from mobile/android/components/geckoview/ShareDelegate.sys.mjs rename to mobile/shared/components/geckoview/ShareDelegate.sys.mjs diff --git a/mobile/shared/components/geckoview/components.conf b/mobile/shared/components/geckoview/components.conf new file mode 100644 index 000000000000..3b86705ecca6 --- /dev/null +++ b/mobile/shared/components/geckoview/components.conf @@ -0,0 +1,89 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +Classes = [ + { + 'cid': '{3e30d2a0-9934-11ea-bb37-0242ac130002}', + 'contract_ids': ['@mozilla.org/embedcomp/prompt-collection;1'], + 'esModule': 'resource://gre/modules/PromptCollection.sys.mjs', + 'constructor': 'PromptCollection', + }, + { + 'js_name': 'prompt', + 'cid': '{076ac188-23c1-4390-aa08-7ef1f78ca5d9}', + 'contract_ids': [ + '@mozilla.org/prompter;1', + ], + 'interfaces': ['nsIPromptService'], + 'esModule': 'resource://gre/modules/GeckoViewPrompt.sys.mjs', + 'constructor': 'PromptFactory', + }, + { + 'cid': '{8e993c34-fdd6-432c-967e-f995d888777f}', + 'contract_ids': ['@mozilla.org/geckoview/startup;1'], + 'esModule': 'resource://gre/modules/GeckoViewStartup.sys.mjs', + 'constructor': 'GeckoViewStartup', + }, + { + 'cid': '{42f3c238-e8e8-4015-9ca2-148723a8afcf}', + 'contract_ids': ['@mozilla.org/content-permission/prompt;1'], + 'esModule': 'resource://gre/modules/GeckoViewPermission.sys.mjs', + 'constructor': 'GeckoViewPermission', + }, + { + 'cid': '{a54d84d7-98a4-4fec-b664-e42e512ae9cc}', + 'contract_ids': ['@mozilla.org/push/Service;1'], + 'esModule': 'resource://gre/modules/GeckoViewPush.sys.mjs', + 'constructor': 'PushService', + }, + { + 'cid': '{fc4bec74-ddd0-4ea8-9a66-9a5081258e32}', + 'contract_ids': ['@mozilla.org/parent/colorpicker;1'], + 'esModule': 'resource://gre/modules/ColorPickerDelegate.sys.mjs', + 'constructor': 'ColorPickerDelegate', + 'processes': ProcessSelector.MAIN_PROCESS_ONLY, + }, + { + 'cid': '{25fdbae6-f684-4bf0-b773-ff2b7a6273c8}', + 'contract_ids': ['@mozilla.org/parent/filepicker;1'], + 'esModule': 'resource://gre/modules/FilePickerDelegate.sys.mjs', + 'constructor': 'FilePickerDelegate', + 'processes': ProcessSelector.MAIN_PROCESS_ONLY, + }, + { + 'cid': '{1201d357-8417-4926-a694-e6408fbedcf8}', + 'contract_ids': ['@mozilla.org/sharepicker;1'], + 'esModule': 'resource://gre/modules/ShareDelegate.sys.mjs', + 'constructor': 'ShareDelegate', + 'processes': ProcessSelector.MAIN_PROCESS_ONLY, + }, + { + 'cid': '{3d765750-1c3d-11ea-aaef-0800200c9a66}', + 'contract_ids': ['@mozilla.org/login-manager/prompter;1'], + 'esModule': 'resource://gre/modules/LoginStorageDelegate.sys.mjs', + 'constructor': 'LoginStorageDelegate', + 'processes': ProcessSelector.MAIN_PROCESS_ONLY, + }, + { + 'cid': '{ad643d9e-52e3-4385-a57c-b42deb2f5daf}', + 'contract_ids': ['@mozilla.org/toolkit/sessionstore-functions;1'], + 'esModule': 'resource://gre/modules/SessionStoreFunctions.sys.mjs', + 'constructor': 'SessionStoreFunctions', + }, +] + +if defined('MOZ_ANDROID_HISTORY'): + Classes += [ + { + 'name': 'History', + 'cid': '{0937a705-91a6-417a-8292-b22eb10da86c}', + 'contract_ids': ['@mozilla.org/browser/history;1'], + 'singleton': True, + 'type': 'GeckoViewHistory', + 'headers': ['GeckoViewHistory.h'], + 'constructor': 'GeckoViewHistory::GetSingleton', + }, + ] diff --git a/mobile/shared/components/geckoview/moz.build b/mobile/shared/components/geckoview/moz.build new file mode 100644 index 000000000000..cbe6ef8543a5 --- /dev/null +++ b/mobile/shared/components/geckoview/moz.build @@ -0,0 +1,38 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +if CONFIG["MOZ_ANDROID_HISTORY"]: + EXPORTS += [ + "GeckoViewHistory.h", + ] + SOURCES += [ + "GeckoViewHistory.cpp", + ] + include("/ipc/chromium/chromium-config.mozbuild") + +XPCOM_MANIFESTS += [ + "components.conf", +] + +EXTRA_COMPONENTS += [ + "GeckoView.manifest", +] + +EXTRA_JS_MODULES += [ + "ColorPickerDelegate.sys.mjs", + "FilePickerDelegate.sys.mjs", + "GeckoViewPermission.sys.mjs", + "GeckoViewPrompt.sys.mjs", + "GeckoViewPrompter.sys.mjs", + "GeckoViewPush.sys.mjs", + "GeckoViewStartup.sys.mjs", + "LoginStorageDelegate.sys.mjs", + "PromptCollection.sys.mjs", + "SessionStoreFunctions.sys.mjs", + "ShareDelegate.sys.mjs", +] + +FINAL_LIBRARY = "xul" diff --git a/mobile/shared/components/moz.build b/mobile/shared/components/moz.build new file mode 100644 index 000000000000..a6300de34958 --- /dev/null +++ b/mobile/shared/components/moz.build @@ -0,0 +1,16 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +with Files("**"): + BUG_COMPONENT = ("GeckoView", "General") + +with Files("extensions/**"): + BUG_COMPONENT = ("WebExtensions", "Android") + +DIRS += [ + "extensions", + "geckoview", +] diff --git a/mobile/android/modules/dbg-browser-actors.js b/mobile/shared/modules/dbg-browser-actors.js similarity index 100% rename from mobile/android/modules/dbg-browser-actors.js rename to mobile/shared/modules/dbg-browser-actors.js diff --git a/mobile/android/modules/geckoview/BrowserUsageTelemetry.sys.mjs b/mobile/shared/modules/geckoview/BrowserUsageTelemetry.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/BrowserUsageTelemetry.sys.mjs rename to mobile/shared/modules/geckoview/BrowserUsageTelemetry.sys.mjs diff --git a/mobile/android/modules/geckoview/ChildCrashHandler.sys.mjs b/mobile/shared/modules/geckoview/ChildCrashHandler.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/ChildCrashHandler.sys.mjs rename to mobile/shared/modules/geckoview/ChildCrashHandler.sys.mjs diff --git a/mobile/android/modules/geckoview/DelayedInit.sys.mjs b/mobile/shared/modules/geckoview/DelayedInit.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/DelayedInit.sys.mjs rename to mobile/shared/modules/geckoview/DelayedInit.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewActorChild.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewActorChild.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewActorChild.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewActorChild.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewActorManager.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewActorManager.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewActorManager.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewActorManager.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewActorParent.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewActorParent.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewActorParent.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewActorParent.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewAutocomplete.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewAutocomplete.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewAutocomplete.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewAutocomplete.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewAutofill.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewAutofill.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewAutofill.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewAutofill.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewChildModule.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewChildModule.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewChildModule.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewChildModule.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewClipboardPermission.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewClipboardPermission.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewClipboardPermission.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewClipboardPermission.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewConsole.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewConsole.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewConsole.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewConsole.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewContent.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewContent.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewContentBlocking.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewContentBlocking.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewContentBlocking.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewContentBlocking.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewIdentityCredential.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewIdentityCredential.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewIdentityCredential.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewIdentityCredential.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewMediaControl.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewMediaControl.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewMediaControl.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewMediaControl.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewModule.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewModule.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewModule.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewModule.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewNavigation.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewNavigation.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewNavigation.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewNavigation.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewProgress.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewPushController.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewPushController.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewPushController.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewPushController.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewRemoteDebugger.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewRemoteDebugger.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewRemoteDebugger.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewSelectionAction.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewSelectionAction.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewSelectionAction.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewSelectionAction.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewSessionStore.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewSessionStore.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewSessionStore.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewSessionStore.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewSettings.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewSettings.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewSettings.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewSettings.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewStorageController.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewStorageController.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewStorageController.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewStorageController.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewTab.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewTab.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewTab.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewTab.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewTelemetry.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewTelemetry.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewTelemetry.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewTelemetry.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewTestUtils.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewTestUtils.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewTestUtils.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewTestUtils.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewTranslations.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewTranslations.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewTranslations.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewTranslations.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewUtils.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewUtils.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewUtils.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewUtils.sys.mjs diff --git a/mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs rename to mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs diff --git a/mobile/android/modules/geckoview/LoadURIDelegate.sys.mjs b/mobile/shared/modules/geckoview/LoadURIDelegate.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/LoadURIDelegate.sys.mjs rename to mobile/shared/modules/geckoview/LoadURIDelegate.sys.mjs diff --git a/mobile/android/modules/geckoview/MediaUtils.sys.mjs b/mobile/shared/modules/geckoview/MediaUtils.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/MediaUtils.sys.mjs rename to mobile/shared/modules/geckoview/MediaUtils.sys.mjs diff --git a/mobile/android/modules/geckoview/Messaging.sys.mjs b/mobile/shared/modules/geckoview/Messaging.sys.mjs similarity index 100% rename from mobile/android/modules/geckoview/Messaging.sys.mjs rename to mobile/shared/modules/geckoview/Messaging.sys.mjs diff --git a/mobile/android/modules/geckoview/metrics.yaml b/mobile/shared/modules/geckoview/metrics.yaml similarity index 100% rename from mobile/android/modules/geckoview/metrics.yaml rename to mobile/shared/modules/geckoview/metrics.yaml diff --git a/mobile/shared/modules/geckoview/moz.build b/mobile/shared/modules/geckoview/moz.build new file mode 100644 index 000000000000..8911ece4a035 --- /dev/null +++ b/mobile/shared/modules/geckoview/moz.build @@ -0,0 +1,44 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +EXTRA_JS_MODULES += [ + "BrowserUsageTelemetry.sys.mjs", + "ChildCrashHandler.sys.mjs", + "DelayedInit.sys.mjs", + "GeckoViewActorChild.sys.mjs", + "GeckoViewActorManager.sys.mjs", + "GeckoViewActorParent.sys.mjs", + "GeckoViewAutocomplete.sys.mjs", + "GeckoViewAutofill.sys.mjs", + "GeckoViewChildModule.sys.mjs", + "GeckoViewClipboardPermission.sys.mjs", + "GeckoViewConsole.sys.mjs", + "GeckoViewContent.sys.mjs", + "GeckoViewContentBlocking.sys.mjs", + "GeckoViewIdentityCredential.sys.mjs", + "GeckoViewMediaControl.sys.mjs", + "GeckoViewModule.sys.mjs", + "GeckoViewNavigation.sys.mjs", + "GeckoViewProcessHangMonitor.sys.mjs", + "GeckoViewProgress.sys.mjs", + "GeckoViewPushController.sys.mjs", + "GeckoViewRemoteDebugger.sys.mjs", + "GeckoViewSelectionAction.sys.mjs", + "GeckoViewSessionStore.sys.mjs", + "GeckoViewSettings.sys.mjs", + "GeckoViewStorageController.sys.mjs", + "GeckoViewTab.sys.mjs", + "GeckoViewTelemetry.sys.mjs", + "GeckoViewTestUtils.sys.mjs", + "GeckoViewTranslations.sys.mjs", + "GeckoViewUtils.sys.mjs", + "GeckoViewWebExtension.sys.mjs", + "LoadURIDelegate.sys.mjs", + "MediaUtils.sys.mjs", + "Messaging.sys.mjs", +] + +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"] diff --git a/mobile/android/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js b/mobile/shared/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js similarity index 100% rename from mobile/android/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js rename to mobile/shared/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js diff --git a/mobile/android/modules/geckoview/test/xpcshell/xpcshell.toml b/mobile/shared/modules/geckoview/test/xpcshell/xpcshell.toml similarity index 100% rename from mobile/android/modules/geckoview/test/xpcshell/xpcshell.toml rename to mobile/shared/modules/geckoview/test/xpcshell/xpcshell.toml diff --git a/mobile/shared/modules/moz.build b/mobile/shared/modules/moz.build new file mode 100644 index 000000000000..52db19075d4e --- /dev/null +++ b/mobile/shared/modules/moz.build @@ -0,0 +1,18 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +# Most files are General, a few exceptions +with Files("**"): + BUG_COMPONENT = ("GeckoView", "General") + +DIRS += [ + "geckoview", + "test", +] + +EXTRA_JS_MODULES += [ + "dbg-browser-actors.js", +] diff --git a/mobile/android/modules/test/AppUiTestDelegate.sys.mjs b/mobile/shared/modules/test/AppUiTestDelegate.sys.mjs similarity index 100% rename from mobile/android/modules/test/AppUiTestDelegate.sys.mjs rename to mobile/shared/modules/test/AppUiTestDelegate.sys.mjs diff --git a/mobile/android/modules/test/moz.build b/mobile/shared/modules/test/moz.build similarity index 100% rename from mobile/android/modules/test/moz.build rename to mobile/shared/modules/test/moz.build diff --git a/mobile/shared/moz.build b/mobile/shared/moz.build new file mode 100644 index 000000000000..ac06d3e80b63 --- /dev/null +++ b/mobile/shared/moz.build @@ -0,0 +1,16 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +with Files("**"): + BUG_COMPONENT = ("GeckoView", "General") + SCHEDULES.exclusive = ["android", "ios"] + +DIRS += [ + "actors", + "chrome", + "components", + "modules", +] diff --git a/taskcluster/kinds/source-test/python.yml b/taskcluster/kinds/source-test/python.yml index 310899aa1ae3..f0b964d28414 100644 --- a/taskcluster/kinds/source-test/python.yml +++ b/taskcluster/kinds/source-test/python.yml @@ -618,7 +618,7 @@ webext: - 'toolkit/components/extensions/webidl-api/**' - 'toolkit/components/extensions/schemas/*.json' - 'browser/components/extensions/schemas/*.json' - - 'mobile/android/components/extensions/schemas/*.json' + - 'mobile/shared/components/extensions/schemas/*.json' xpcom: description: xpcom unit tests diff --git a/taskcluster/test/data/bugbug-push-schedules.json b/taskcluster/test/data/bugbug-push-schedules.json index 7bcbc0df6534..b780dcca4986 100644 --- a/taskcluster/test/data/bugbug-push-schedules.json +++ b/taskcluster/test/data/bugbug-push-schedules.json @@ -950,7 +950,7 @@ "layout/svg/tests/mochitest.toml": ["test-windows11-64-2009/opt-*"], "layout/xul/test/browser.toml": ["test-windows11-64-2009-qr/opt-*"], "layout/xul/test/chrome.toml": ["test-windows11-64-2009/opt-*-1proc"], - "mobile/android/components/extensions/test/mochitest/mochitest.toml": [ + "mobile/shared/components/extensions/test/mochitest/mochitest.toml": [ "test-android-em-7.0-x86_64/opt-geckoview-*" ], "modules/libpref/test/unit/xpcshell.toml": ["test-windows11-64-2009/opt-*"], @@ -2192,7 +2192,7 @@ "layout/svg/tests/mochitest.toml": 0.62, "layout/xul/test/browser.toml": 0.51, "layout/xul/test/chrome.toml": 0.5, - "mobile/android/components/extensions/test/mochitest/mochitest.toml": 0.57, + "mobile/shared/components/extensions/test/mochitest/mochitest.toml": 0.57, "modules/libpref/test/unit/xpcshell.toml": 0.52, "netwerk/test/browser/browser.toml": 0.71, "netwerk/test/httpserver/test/xpcshell.toml": 0.72, diff --git a/testing/runtimes/manifest-runtimes-android.json b/testing/runtimes/manifest-runtimes-android.json index 776c9a84c64d..e7edc55cd8a3 100644 --- a/testing/runtimes/manifest-runtimes-android.json +++ b/testing/runtimes/manifest-runtimes-android.json @@ -178,7 +178,7 @@ "layout/svg/tests/mochitest.ini": 1.65, "layout/tables/test/mochitest.ini": 1.24, "layout/xul/test/mochitest.ini": 1.53, - "mobile/android/components/extensions/test/mochitest/mochitest.ini": 14.14, + "mobile/shared/components/extensions/test/mochitest/mochitest.ini": 14.14, "modules/libjar/test/mochitest/mochitest.ini": 1.15, "netwerk/cookie/test/mochitest/mochitest.ini": 5.56, "netwerk/test/mochitests/mochitest.ini": 8.4, diff --git a/testing/specialpowers/content/AppTestDelegateParent.sys.mjs b/testing/specialpowers/content/AppTestDelegateParent.sys.mjs index ec871c644af0..55e92017e8b9 100644 --- a/testing/specialpowers/content/AppTestDelegateParent.sys.mjs +++ b/testing/specialpowers/content/AppTestDelegateParent.sys.mjs @@ -24,7 +24,7 @@ * * MOZ_BUILD_APP-specific AppUiTestDelegate.sys.mjs implementations: * - browser/components/extensions/test/AppUiTestDelegate.sys.mjs - * - mobile/android/modules/test/AppUiTestDelegate.sys.mjs + * - mobile/shared/modules/test/AppUiTestDelegate.sys.mjs * - mail/components/extensions/test/AppUiTestDelegate.sys.mjs (in comm-central) * * Glue between AppUiTestDelegate.sys.mjs in parent and test code in child: diff --git a/toolkit/components/extensions/docs/basics.rst b/toolkit/components/extensions/docs/basics.rst index 35d61561e2b0..6c9dfa51d40f 100644 --- a/toolkit/components/extensions/docs/basics.rst +++ b/toolkit/components/extensions/docs/basics.rst @@ -60,7 +60,7 @@ files: - ``toolkit/components/extensions/ext-toolkit.json`` - ``browser/components/extensions/ext-browser.json`` -- ``mobile/android/components/extensions/ext-android.json`` +- ``mobile/shared/components/extensions/ext-android.json`` Here is a sample fragment for a new API: @@ -90,7 +90,7 @@ API implementations are: other applications built on Gecko) should go - ``browser/components/extensions``: APIs that are only supported on Firefox for the desktop. -- ``mobile/android/components/extensions``: APIs that are only supported +- ``mobile/shared/components/extensions``: APIs that are only supported on Firefox for Android. Within the appropriate extensions directory, the convention is that the @@ -249,7 +249,7 @@ all API scripts look to the following source: - Only available in the Desktop builds: `browser/components/extensions/parent/ext-browser.js `_ - Only available in the Android builds: - `mobile/android/components/extensions/ext-android.js `_ + `mobile/shared/components/extensions/ext-android.js `_ .. warning:: The extension API authors should never redefine these globals to avoid introducing potential diff --git a/toolkit/components/extensions/test/mochitest/test_ext_downloads_download.html b/toolkit/components/extensions/test/mochitest/test_ext_downloads_download.html index 23058c35eca4..6c87387be439 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_downloads_download.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_downloads_download.html @@ -14,7 +14,7 @@ "use strict"; async function background() { - const url = "http://mochi.test:8888/tests/mobile/android/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; + const url = "http://mochi.test:8888/tests/mobile/shared/components/extensions/test/mochitest/context_tabs_onUpdated_page.html"; browser.test.assertThrows( () => browser.downloads.download(), diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js b/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js index 925f8f9dfe65..875b8ee8bd1b 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js @@ -479,7 +479,7 @@ add_task(async function nativeMessaging_permission() { if (IS_NATIVE_MESSAGING_PRIVILEGED) { // The behavior of nativeMessaging for unprivileged extensions on Android // is covered in - // mobile/android/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js + // mobile/shared/components/extensions/test/xpcshell/test_ext_native_messaging_permissions.js deepEqual( manifestPermissions, { origins: [], permissions: [] }, diff --git a/toolkit/components/extensions/webidl-api/ExtensionWebIDL.conf b/toolkit/components/extensions/webidl-api/ExtensionWebIDL.conf index be312c80d4dd..acdf14f67c9f 100644 --- a/toolkit/components/extensions/webidl-api/ExtensionWebIDL.conf +++ b/toolkit/components/extensions/webidl-api/ExtensionWebIDL.conf @@ -85,7 +85,7 @@ WEBEXT_WORKER_HIDDEN_SET = set([ WEBEXT_SCHEMADIRS_MAPPING = { "toolkit": ["toolkit", "components", "extensions", "schemas"], "browser": ["browser", "components", "extensions", "schemas"], - "mobile": ["mobile", "android", "components", "extensions", "schemas"], + "mobile": ["mobile", "shared", "components", "extensions", "schemas"], } # List of toolkit-level WebExtensions API namespaces that are not included diff --git a/toolkit/components/glean/metrics_index.py b/toolkit/components/glean/metrics_index.py index 3390f711ab37..146cf4c22bb0 100644 --- a/toolkit/components/glean/metrics_index.py +++ b/toolkit/components/glean/metrics_index.py @@ -29,8 +29,8 @@ gecko_metrics = [ "image/decoders/metrics.yaml", "js/xpconnect/metrics.yaml", "layout/base/metrics.yaml", - "mobile/android/actors/metrics.yaml", - "mobile/android/modules/geckoview/metrics.yaml", + "mobile/shared/actors/metrics.yaml", + "mobile/shared/modules/geckoview/metrics.yaml", "netwerk/metrics.yaml", "netwerk/protocol/http/metrics.yaml", "security/certverifier/metrics.yaml", diff --git a/toolkit/components/passwordmgr/components.conf b/toolkit/components/passwordmgr/components.conf index 4adb4c3b3f4d..d0037445578c 100644 --- a/toolkit/components/passwordmgr/components.conf +++ b/toolkit/components/passwordmgr/components.conf @@ -45,7 +45,7 @@ Classes = [ }, ] -if buildconfig.substs['OS_TARGET'] != 'Android': +if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] not in ('android', 'uikit'): Classes += [ { 'cid': '{c47ff942-9678-44a5-bc9b-05e0d676c79c}', diff --git a/toolkit/components/prompts/src/components.conf b/toolkit/components/prompts/src/components.conf index 7be17963ed99..32a6df21a2df 100644 --- a/toolkit/components/prompts/src/components.conf +++ b/toolkit/components/prompts/src/components.conf @@ -13,7 +13,7 @@ Classes = [ }, ] -if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android': +if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] not in ('android', 'uikit'): Classes += [ { 'js_name': 'prompt', diff --git a/tools/tryselect/try_presets.yml b/tools/tryselect/try_presets.yml index b0d258bb0d92..bb40a6f1be78 100644 --- a/tools/tryselect/try_presets.yml +++ b/tools/tryselect/try_presets.yml @@ -314,12 +314,12 @@ webextensions: GeckoView JUnit tests are NOT run. paths: # must be duplicate of test_paths, see bug 1556445 - browser/components/extensions/test/ - - mobile/android/components/extensions/test/ + - mobile/shared/components/extensions/test/ - toolkit/components/extensions/test/ - toolkit/mozapps/extensions/test/ test_paths: # must be duplicate of paths, see bug 1556445 - browser/components/extensions/test/ - - mobile/android/components/extensions/test/ + - mobile/shared/components/extensions/test/ - toolkit/components/extensions/test/ - toolkit/mozapps/extensions/test/ query: