зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1256401 - Part 2: Remove references to b2gdroid. r=fabrice
MozReview-Commit-ID: 63yJGdgPbhe --HG-- extra : rebase_source : 2256e0a12588703a83f4cba06971231ac3c64592 extra : amend_source : 1f35a04191f37225986bd7ff4d0b6b2c34a71b05 extra : histedit_source : 82d351700936c8e1297eeca91ce00f96340e2f2c
This commit is contained in:
Nick Alexander
Родитель
a06e89f5a6
Коммит
e90bd4aabb
|
|
@ -123,15 +123,7 @@ SettingsListener.observe('language.current', 'en-US', function(value) {
|
|||
Services.prefs.setCharPref(prefName, value);
|
||||
|
||||
if (shell.hasStarted() == false) {
|
||||
// On b2gdroid at first run we need to synchronize our wallpaper with
|
||||
// Android one's before bootstrapping.
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
Cc["@mozilla.org/b2g/b2gdroid-setup;1"]
|
||||
.getService().wrappedJSObject.setWallpaper()
|
||||
.then(() => { shell.bootstrap(); });
|
||||
} else {
|
||||
shell.bootstrap();
|
||||
}
|
||||
shell.bootstrap();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -359,8 +351,7 @@ setUpdateTrackingId();
|
|||
});
|
||||
}
|
||||
|
||||
syncPrefDefault(AppConstants.MOZ_B2GDROID ? 'app.update.url.android'
|
||||
: 'app.update.url');
|
||||
syncPrefDefault('app.update.url');
|
||||
syncPrefDefault('app.update.channel');
|
||||
})();
|
||||
|
||||
|
|
|
|||
|
|
@ -262,11 +262,6 @@ var shell = {
|
|||
},
|
||||
|
||||
bootstrap: function() {
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
Cc["@mozilla.org/b2g/b2gdroid-setup;1"]
|
||||
.getService(Ci.nsIObserver).observe(window, "shell-startup", null);
|
||||
}
|
||||
|
||||
window.performance.mark('gecko-shell-bootstrap');
|
||||
|
||||
// Before anything, check if we want to start in safe mode.
|
||||
|
|
@ -739,7 +734,7 @@ var shell = {
|
|||
|
||||
handleCmdLine: function() {
|
||||
// This isn't supported on devices.
|
||||
if (!isGonk && !AppConstants.MOZ_B2GDROID) {
|
||||
if (!isGonk) {
|
||||
let b2gcmds = Cc["@mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds"]
|
||||
.getService(Ci.nsISupports);
|
||||
let args = b2gcmds.wrappedJSObject.cmdLine;
|
||||
|
|
|
|||
|
|
@ -16,15 +16,12 @@ contract @mozilla.org/updates/update-prompt;1 {88b3eb21-d072-4e3b-886d-f89d8c49f
|
|||
category system-update-provider MozillaProvider @mozilla.org/updates/update-prompt;1,{88b3eb21-d072-4e3b-886d-f89d8c49fe59}
|
||||
#endif
|
||||
|
||||
# On b2gdroid we want to use the android implementation of the directory service.
|
||||
#ifndef MOZ_B2GDROID
|
||||
#ifdef MOZ_B2G
|
||||
# DirectoryProvider.js
|
||||
component {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5} DirectoryProvider.js
|
||||
contract @mozilla.org/b2g/directory-provider;1 {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5}
|
||||
category xpcom-directory-providers b2g-directory-provider @mozilla.org/b2g/directory-provider;1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# ActivitiesGlue.js
|
||||
component {3a54788b-48cc-4ab4-93d6-0d6a8ef74f8e} ActivitiesGlue.js
|
||||
|
|
@ -94,7 +91,6 @@ contract @mozilla.org/fxaccounts/fxaccounts-ui-glue;1 {51875c14-91d7-4b8c-b65d-3
|
|||
component {710322af-e6ae-4b0c-b2c9-1474a87b077e} HelperAppDialog.js
|
||||
contract @mozilla.org/helperapplauncherdialog;1 {710322af-e6ae-4b0c-b2c9-1474a87b077e}
|
||||
|
||||
#ifndef MOZ_B2GDROID
|
||||
#ifndef MOZ_WIDGET_GONK
|
||||
component {c83c02c0-5d43-4e3e-987f-9173b313e880} SimulatorScreen.js
|
||||
contract @mozilla.org/simulator-screen;1 {c83c02c0-5d43-4e3e-987f-9173b313e880}
|
||||
|
|
@ -108,7 +104,6 @@ component {385993fe-8710-4621-9fb1-00a09d8bec37} CommandLine.js
|
|||
contract @mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds {385993fe-8710-4621-9fb1-00a09d8bec37}
|
||||
category command-line-handler m-b2gcmds @mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# BootstrapCommandLine.js
|
||||
component {fd663ec8-cf3f-4c2b-aacb-17a6915ccb44} BootstrapCommandLine.js
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ EXTRA_PP_COMPONENTS += [
|
|||
'B2GComponents.manifest',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_B2G'] and not CONFIG['MOZ_B2GDROID']:
|
||||
if CONFIG['MOZ_B2G']:
|
||||
EXTRA_COMPONENTS += [
|
||||
'DirectoryProvider.js',
|
||||
'RecoveryService.js',
|
||||
|
|
|
|||
|
|
@ -2,15 +2,7 @@
|
|||
# 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/.
|
||||
|
||||
# For b2gdroid, gaia ends up in the assets/gaia folder in the APK.
|
||||
GAIA_PATH := $(if MOZ_B2GDROID,gaia/assets/gaia,gaia/profile)
|
||||
|
||||
# For b2gdroid, we disable the screen timeout since this is managed by android.
|
||||
# We also limit the app set to the production ones.
|
||||
GAIA_OPTIONS := $(if MOZ_B2GDROID, \
|
||||
GAIA_DISTRIBUTION_DIR=distros/b2gdroid \
|
||||
NO_LOCK_SCREEN=1 \
|
||||
)
|
||||
GAIA_PATH := gaia/profile
|
||||
|
||||
GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
|
||||
|
||||
|
|
@ -18,5 +10,5 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
libs::
|
||||
+$(MAKE) -j1 -C $(GAIADIR) clean
|
||||
+$(GAIA_OPTIONS) $(MAKE) -j1 -C $(GAIADIR) profile
|
||||
+$(MAKE) -j1 -C $(GAIADIR) profile
|
||||
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(ABS_DIST)/bin/$(GAIA_PATH) && tar -xf -)
|
||||
|
|
|
|||
|
|
@ -4,19 +4,17 @@
|
|||
# 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 not CONFIG['MOZ_B2GDROID']:
|
||||
# b2gdroid does not build a runner executable, but it does build gaia; see Makefile.in.
|
||||
Program(CONFIG['MOZ_APP_NAME'])
|
||||
Program(CONFIG['MOZ_APP_NAME'])
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
SOURCES += [
|
||||
'run-b2g.cpp',
|
||||
]
|
||||
DEFINES['B2G_NAME'] = 'L"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
|
||||
DEFINES['GAIA_PATH'] = 'L"gaia\\\\profile"'
|
||||
else:
|
||||
SOURCES += [
|
||||
'run-b2g.c',
|
||||
]
|
||||
DEFINES['B2G_NAME'] = '"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
|
||||
DEFINES['GAIA_PATH'] = '"gaia/profile"'
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
SOURCES += [
|
||||
'run-b2g.cpp',
|
||||
]
|
||||
DEFINES['B2G_NAME'] = 'L"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
|
||||
DEFINES['GAIA_PATH'] = 'L"gaia\\\\profile"'
|
||||
else:
|
||||
SOURCES += [
|
||||
'run-b2g.c',
|
||||
]
|
||||
DEFINES['B2G_NAME'] = '"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
|
||||
DEFINES['GAIA_PATH'] = '"gaia/profile"'
|
||||
|
|
|
|||
|
|
@ -42,9 +42,6 @@ ifdef MOZTTDIR
|
|||
# Install the Firefox OS fonts.
|
||||
include $(MOZTTDIR)/fonts.mk
|
||||
MOZTT_DEST = $(FINAL_TARGET)/fonts
|
||||
ifdef MOZ_B2GDROID
|
||||
MOZTT_DEST = $(FINAL_TARGET)/res/fonts
|
||||
endif
|
||||
MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
|
||||
INSTALL_TARGETS += MOZTT
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ WebappsActor.prototype = {
|
|||
actorPrefix: "webapps",
|
||||
|
||||
// For now, launch and close requests are only supported on B2G products
|
||||
// like devices, mulet/simulators, graphene and b2gdroid.
|
||||
// like devices, mulet/simulators, and graphene.
|
||||
// We set that attribute on the prototype in order to allow test
|
||||
// to enable this feature.
|
||||
supportsLaunch: require("devtools/shared/system").constants.MOZ_B2G,
|
||||
|
|
|
|||
|
|
@ -285,17 +285,10 @@ var Activities = {
|
|||
// Don't do this check until we have passed to UIGlue so the glue
|
||||
// can choose to launch its own activity if needed.
|
||||
if (aResults.options.length === 0) {
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
// Fallback on the Android Intent mapper.
|
||||
let glue = Cc["@mozilla.org/dom/activities/android-ui-glue;1"]
|
||||
.createInstance(Ci.nsIActivityUIGlue);
|
||||
glue.chooseActivity(aMsg.options, aResults.options, getActivityChoice);
|
||||
} else {
|
||||
self.trySendAndCleanup(aMsg.id, "Activity:FireError", {
|
||||
"id": aMsg.id,
|
||||
"error": "NO_PROVIDER"
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
/* 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/. */
|
||||
|
||||
const { interfaces: Ci, utils: Cu } = Components;
|
||||
|
||||
this.EXPORTED_SYMBOLS = ["AndroidUtils"];
|
||||
|
||||
Cu.import("resource://gre/modules/AppsUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "Messaging",
|
||||
"resource://gre/modules/Messaging.jsm");
|
||||
|
||||
var appsRegistry = null;
|
||||
|
||||
function debug() {
|
||||
//dump("-*- AndroidUtils " + Array.slice(arguments) + "\n");
|
||||
}
|
||||
|
||||
// Helper functions to manage Android native apps. We keep them in the
|
||||
// registry with a `kind` equals to "android-native" and we also store
|
||||
// the package name and class name in the registry.
|
||||
// Communication with the android side happens through json messages.
|
||||
|
||||
this.AndroidUtils = {
|
||||
init: function(aRegistry) {
|
||||
appsRegistry = aRegistry;
|
||||
Services.obs.addObserver(this, "Android:Apps:Installed", false);
|
||||
Services.obs.addObserver(this, "Android:Apps:Uninstalled", false);
|
||||
},
|
||||
|
||||
uninit: function() {
|
||||
Services.obs.removeObserver(this, "Android:Apps:Installed");
|
||||
Services.obs.removeObserver(this, "Android:Apps:Uninstalled");
|
||||
},
|
||||
|
||||
getOriginAndManifestURL: function(aPackageName) {
|
||||
let origin = "android://" + aPackageName.toLowerCase();
|
||||
let manifestURL = origin + "/manifest.webapp";
|
||||
return [origin, manifestURL];
|
||||
},
|
||||
|
||||
getPackageAndClassFromManifestURL: function(aManifestURL) {
|
||||
debug("getPackageAndClassFromManifestURL " + aManifestURL);
|
||||
let app = appsRegistry.getAppByManifestURL(aManifestURL);
|
||||
if (!app) {
|
||||
debug("No app for " + aManifestURL);
|
||||
return [];
|
||||
}
|
||||
return [app.android_packagename, app.android_classname];
|
||||
},
|
||||
|
||||
buildAndroidAppData: function(aApp) {
|
||||
// Use the package and class name to get a unique origin.
|
||||
// We put the version with the normal case as part of the manifest url.
|
||||
let [origin, manifestURL] =
|
||||
this.getOriginAndManifestURL(aApp.packagename);
|
||||
// We choose 96 as an arbitrary size since we can only get one icon
|
||||
// from Android.
|
||||
let manifest = {
|
||||
name: aApp.name,
|
||||
icons: { "96": aApp.icon }
|
||||
}
|
||||
debug("Origin is " + origin);
|
||||
let appData = {
|
||||
app: {
|
||||
installOrigin: origin,
|
||||
origin: origin,
|
||||
manifest: manifest,
|
||||
manifestURL: manifestURL,
|
||||
manifestHash: AppsUtils.computeHash(JSON.stringify(manifest)),
|
||||
appStatus: Ci.nsIPrincipal.APP_STATUS_INSTALLED,
|
||||
removable: aApp.removable,
|
||||
android_packagename: aApp.packagename,
|
||||
android_classname: aApp.classname
|
||||
},
|
||||
isBrowser: false,
|
||||
isPackage: false
|
||||
};
|
||||
|
||||
return appData;
|
||||
},
|
||||
|
||||
installAndroidApps: function() {
|
||||
return Messaging.sendRequestForResult({ type: "Apps:GetList" }).then(
|
||||
aApps => {
|
||||
debug("Got " + aApps.apps.length + " android apps.");
|
||||
let promises = [];
|
||||
aApps.apps.forEach(app => {
|
||||
debug("App is " + app.name + " removable? " + app.removable);
|
||||
let p = new Promise((aResolveInstall, aRejectInstall) => {
|
||||
let appData = this.buildAndroidAppData(app);
|
||||
appsRegistry.confirmInstall(appData, null, aResolveInstall);
|
||||
});
|
||||
promises.push(p);
|
||||
});
|
||||
|
||||
// Wait for all apps to be installed.
|
||||
return Promise.all(promises);
|
||||
}
|
||||
).then(appsRegistry._saveApps.bind(appsRegistry));
|
||||
},
|
||||
|
||||
observe: function(aSubject, aTopic, aData) {
|
||||
let data;
|
||||
try {
|
||||
data = JSON.parse(aData);
|
||||
} catch(e) {
|
||||
debug(e);
|
||||
return;
|
||||
}
|
||||
|
||||
if (aTopic == "Android:Apps:Installed") {
|
||||
let appData = this.buildAndroidAppData(data);
|
||||
appsRegistry.confirmInstall(appData);
|
||||
} else if (aTopic == "Android:Apps:Uninstalled") {
|
||||
let [origin, manifestURL] =
|
||||
this.getOriginAndManifestURL(data.packagename);
|
||||
appsRegistry.uninstall(manifestURL);
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -132,10 +132,6 @@ function _setAppProperties(aObj, aApp) {
|
|||
aApp.blockedStatus !== undefined ? aApp.blockedStatus
|
||||
: Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
|
||||
aObj.blocklistId = aApp.blocklistId;
|
||||
#ifdef MOZ_B2GDROID
|
||||
aObj.android_packagename = aApp.android_packagename;
|
||||
aObj.android_classname = aApp.android_classname;
|
||||
#endif
|
||||
}
|
||||
|
||||
this.AppsUtils = {
|
||||
|
|
|
|||
|
|
@ -254,11 +254,6 @@ this.DOMApplicationRegistry = {
|
|||
this.getFullAppByManifestURL.bind(this));
|
||||
|
||||
MessageBroadcaster.init(this.getAppByManifestURL);
|
||||
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
Cu.import("resource://gre/modules/AndroidUtils.jsm");
|
||||
AndroidUtils.init(this);
|
||||
}
|
||||
},
|
||||
|
||||
// loads the current registry, that could be empty on first run.
|
||||
|
|
@ -528,7 +523,7 @@ this.DOMApplicationRegistry = {
|
|||
|
||||
// Installs a 3rd party app.
|
||||
installPreinstalledApp: function installPreinstalledApp(aId) {
|
||||
if (!AppConstants.MOZ_B2GDROID && AppConstants.platform !== "gonk") {
|
||||
if (AppConstants.platform !== "gonk") {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -797,14 +792,10 @@ this.DOMApplicationRegistry = {
|
|||
}
|
||||
}
|
||||
|
||||
if (AppConstants.MOZ_B2GDROID || AppConstants.MOZ_B2G) {
|
||||
if (AppConstants.MOZ_B2G) {
|
||||
yield this.installSystemApps();
|
||||
}
|
||||
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
yield AndroidUtils.installAndroidApps();
|
||||
}
|
||||
|
||||
// At first run, install preloaded apps and set up their permissions.
|
||||
for (let id in this.webapps) {
|
||||
let isPreinstalled = this.installPreinstalledApp(id);
|
||||
|
|
@ -1209,9 +1200,6 @@ this.DOMApplicationRegistry = {
|
|||
Services.obs.removeObserver(this, "memory-pressure");
|
||||
cpmm = null;
|
||||
ppmm = null;
|
||||
if (AppConstants.MOZ_B2GDROID) {
|
||||
AndroidUtils.uninit();
|
||||
}
|
||||
} else if (aTopic == "memory-pressure") {
|
||||
// Clear the manifest cache on memory pressure.
|
||||
this._manifestCache = {};
|
||||
|
|
@ -1365,7 +1353,7 @@ this.DOMApplicationRegistry = {
|
|||
this.registryReady.then( () => {
|
||||
switch (aMessage.name) {
|
||||
case "Webapps:Install": {
|
||||
if (AppConstants.platform == "android" && !AppConstants.MOZ_B2GDROID) {
|
||||
if (AppConstants.platform == "android") {
|
||||
Services.obs.notifyObservers(mm, "webapps-runtime-install", JSON.stringify(msg));
|
||||
} else {
|
||||
this.doInstall(msg, mm);
|
||||
|
|
@ -1376,7 +1364,7 @@ this.DOMApplicationRegistry = {
|
|||
this.getSelf(msg, mm);
|
||||
break;
|
||||
case "Webapps:Uninstall":
|
||||
if (AppConstants.platform == "android" && !AppConstants.MOZ_B2GDROID) {
|
||||
if (AppConstants.platform == "android") {
|
||||
Services.obs.notifyObservers(mm, "webapps-runtime-uninstall", JSON.stringify(msg));
|
||||
} else {
|
||||
this.doUninstall(msg, mm);
|
||||
|
|
@ -1395,7 +1383,7 @@ this.DOMApplicationRegistry = {
|
|||
this.getInstalled(msg, mm);
|
||||
break;
|
||||
case "Webapps:InstallPackage": {
|
||||
if (AppConstants.platform == "android" && !AppConstants.MOZ_B2GDROID) {
|
||||
if (AppConstants.platform == "android") {
|
||||
Services.obs.notifyObservers(mm, "webapps-runtime-install-package", JSON.stringify(msg));
|
||||
} else {
|
||||
this.doInstallPackage(msg, mm);
|
||||
|
|
|
|||
|
|
@ -45,11 +45,6 @@ EXTRA_JS_MODULES += [
|
|||
'UserCustomizations.jsm',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_B2GDROID']:
|
||||
EXTRA_JS_MODULES += [
|
||||
'AndroidUtils.jsm',
|
||||
]
|
||||
|
||||
EXTRA_PP_JS_MODULES += [
|
||||
'AppsUtils.jsm',
|
||||
'ImportExport.jsm',
|
||||
|
|
|
|||
|
|
@ -198,13 +198,6 @@ DeviceStorageStatics::InitDirs()
|
|||
NS_NewLocalFile(path, /* aFollowLinks */ true,
|
||||
getter_AddRefs(mDirs[TYPE_SDCARD]));
|
||||
}
|
||||
#ifdef MOZ_B2GDROID
|
||||
if (NS_SUCCEEDED(mozilla::AndroidBridge::GetExternalPublicDirectory(
|
||||
NS_LITERAL_STRING(DEVICESTORAGE_APPS), path))) {
|
||||
NS_NewLocalFile(path, /* aFollowLinks */ true,
|
||||
getter_AddRefs(mDirs[TYPE_APPS]));
|
||||
}
|
||||
#endif
|
||||
|
||||
#elif defined (XP_UNIX)
|
||||
dirService->Get(NS_UNIX_XDG_PICTURES_DIR,
|
||||
|
|
@ -239,10 +232,8 @@ DeviceStorageStatics::InitDirs()
|
|||
}
|
||||
#endif // !MOZ_WIDGET_ANDROID
|
||||
|
||||
#ifndef MOZ_B2GDROID
|
||||
dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile),
|
||||
getter_AddRefs(mDirs[TYPE_APPS]));
|
||||
#endif
|
||||
|
||||
if (mDirs[TYPE_APPS]) {
|
||||
mDirs[TYPE_APPS]->AppendRelativeNativePath(NS_LITERAL_CSTRING("webapps"));
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ mozJSComponentLoader::ReallyInit()
|
|||
// results in getting the wrong value.
|
||||
// But we don't want that on Firefox Mulet as it break most Firefox JSMs...
|
||||
// Also disable on debug builds to break js components that rely on this.
|
||||
#if defined(MOZ_B2G) && !defined(MOZ_MULET) && !defined(MOZ_B2GDROID) && !defined(DEBUG)
|
||||
#if defined(MOZ_B2G) && !defined(MOZ_MULET) && !defined(DEBUG)
|
||||
mReuseLoaderGlobal = true;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1164,17 +1164,11 @@ InitSystemMetrics()
|
|||
sSystemMetrics->AppendElement(nsGkAtoms::swipe_animation_enabled);
|
||||
}
|
||||
|
||||
// On b2gdroid, make it so that we always have a physical home button from
|
||||
// gecko's point of view, event if it's just the Android home button remapped.
|
||||
#ifdef MOZ_B2GDROID
|
||||
sSystemMetrics->AppendElement(nsGkAtoms::physical_home_button);
|
||||
#else
|
||||
rv = LookAndFeel::GetInt(LookAndFeel::eIntID_PhysicalHomeButton,
|
||||
&metricResult);
|
||||
if (NS_SUCCEEDED(rv) && metricResult) {
|
||||
sSystemMetrics->AppendElement(nsGkAtoms::physical_home_button);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
if (NS_SUCCEEDED(
|
||||
|
|
|
|||
|
|
@ -299,11 +299,7 @@
|
|||
We are overriding the snackbar message style to guarantee a consistent style across Android versions (bug 1217416).
|
||||
-->
|
||||
<style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance" tools:override="true">
|
||||
<!--
|
||||
This is the value of "design_snackbar_text_size". As long as B2Gdroid does not include the
|
||||
Android Design Support Library we cannot reference it here directly.
|
||||
-->
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textSize">@dimen/design_snackbar_text_size</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -75,9 +75,6 @@ DirectoryProvider.prototype = {
|
|||
// implementation would have returned.
|
||||
let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
|
||||
return new FileUtils.File(env.get("DOWNLOADS_DIRECTORY"));
|
||||
} else if (AppConstants.MOZ_B2GDROID && prop === "coreAppsDir") {
|
||||
let dirsvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
|
||||
return dirsvc.get("DefRt", Ci.nsIFile);
|
||||
}
|
||||
|
||||
// We are retuning null to show failure instead for throwing an error. The
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ category xpcom-directory-providers browser-directory-provider @mozilla.org/brows
|
|||
# stylesheets
|
||||
category agent-style-sheets browser-content-stylesheet chrome://browser/skin/content.css
|
||||
|
||||
#ifndef MOZ_B2GDROID
|
||||
# SessionStore.js
|
||||
component {8c1f07d6-cba3-4226-a315-8bd43d67d032} SessionStore.js
|
||||
contract @mozilla.org/browser/sessionstore;1 {8c1f07d6-cba3-4226-a315-8bd43d67d032}
|
||||
|
|
@ -44,7 +43,6 @@ contract @mozilla.org/prompter;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
|
|||
contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
|
||||
component {80dae1e9-e0d2-4974-915f-f97050fa8068} PromptService.js
|
||||
contract @mozilla.org/network/authprompt-adapter-factory;1 {80dae1e9-e0d2-4974-915f-f97050fa8068}
|
||||
#endif
|
||||
|
||||
# ImageBlockingPolicy.js
|
||||
component {f55f77f9-d33d-4759-82fc-60db3ee0bb91} ImageBlockingPolicy.js
|
||||
|
|
@ -113,8 +111,4 @@ contract @mozilla.org/colorpicker;1 {430b987f-bb9f-46a3-99a5-241749220b29}
|
|||
|
||||
# AndroidActivitiesGlue.js
|
||||
component {e4deb5f6-d5e3-4fce-bc53-901dd9951c48} AndroidActivitiesGlue.js
|
||||
#ifdef MOZ_B2GDROID
|
||||
contract @mozilla.org/dom/activities/android-ui-glue;1 {e4deb5f6-d5e3-4fce-bc53-901dd9951c48}
|
||||
#else
|
||||
contract @mozilla.org/dom/activities/ui-glue;1 {e4deb5f6-d5e3-4fce-bc53-901dd9951c48}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -18,25 +18,21 @@ EXTRA_COMPONENTS += [
|
|||
'BrowserCLH.js',
|
||||
'ColorPicker.js',
|
||||
'ContentDispatchChooser.js',
|
||||
'ContentPermissionPrompt.js',
|
||||
'DirectoryProvider.js',
|
||||
'FilePicker.js',
|
||||
'HelperAppDialog.js',
|
||||
'ImageBlockingPolicy.js',
|
||||
'LoginManagerPrompter.js',
|
||||
'NSSDialogService.js',
|
||||
'PromptService.js',
|
||||
'SessionStore.js',
|
||||
'SiteSpecificUserAgent.js',
|
||||
'Snippets.js',
|
||||
'TabSource.js',
|
||||
'XPIDialogService.js',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_B2GDROID']:
|
||||
EXTRA_COMPONENTS += [
|
||||
'ContentPermissionPrompt.js',
|
||||
'FilePicker.js',
|
||||
'HelperAppDialog.js',
|
||||
'PromptService.js',
|
||||
'SessionStore.js',
|
||||
'SiteSpecificUserAgent.js',
|
||||
]
|
||||
|
||||
# Keep it this way if at all possible. If you need preprocessing,
|
||||
# consider adding fields to AppConstants.jsm.
|
||||
EXTRA_PP_COMPONENTS += [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ EXTRA_JS_MODULES += [
|
|||
'dbg-browser-actors.js',
|
||||
'DelayedInit.jsm',
|
||||
'DownloadNotifications.jsm',
|
||||
'FxAccountsWebChannel.jsm',
|
||||
'HelperApps.jsm',
|
||||
'Home.jsm',
|
||||
'HomeProvider.jsm',
|
||||
|
|
@ -31,8 +32,3 @@ EXTRA_JS_MODULES += [
|
|||
'SSLExceptions.jsm',
|
||||
'TabMirror.jsm',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_B2GDROID']:
|
||||
EXTRA_JS_MODULES += [
|
||||
'FxAccountsWebChannel.jsm',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -9,9 +9,5 @@ MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
|
|||
TEST_DIRS += [
|
||||
'junit3',
|
||||
'robocop/roboextender',
|
||||
'robocop',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_B2GDROID']:
|
||||
TEST_DIRS += [
|
||||
'robocop',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3154,10 +3154,6 @@ if test -n "$MOZ_MULET"; then
|
|||
AC_DEFINE(MOZ_MULET)
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_B2GDROID"; then
|
||||
AC_DEFINE(MOZ_B2GDROID)
|
||||
fi
|
||||
|
||||
# Propagate feature switches for code written in rust from confvars.sh
|
||||
if test -n "$MOZ_RUST"; then
|
||||
if test -n "$MOZ_RUST_MP4PARSE"; then
|
||||
|
|
@ -3171,7 +3167,6 @@ AC_SUBST(MOZ_XULRUNNER)
|
|||
AC_SUBST(MOZ_B2G)
|
||||
AC_SUBST(MOZ_MULET)
|
||||
AC_SUBST(MOZ_B2G_VERSION)
|
||||
AC_SUBST(MOZ_B2GDROID)
|
||||
|
||||
AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
|
||||
|
||||
|
|
@ -3182,13 +3177,13 @@ dnl ========================================================
|
|||
|
||||
if test -z "$gonkdir" ; then
|
||||
case "$MOZ_BUILD_APP" in
|
||||
mobile/android | mobile/android/b2gdroid)
|
||||
mobile/android)
|
||||
case "$target" in
|
||||
*-android*|*-linuxandroid*)
|
||||
:
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([You must specify --target=arm-linux-androideabi (or some other valid android target) when building with --enable-application=mobile/android or --enable-application=mobile/android/b2gdroid.
|
||||
AC_MSG_ERROR([You must specify --target=arm-linux-androideabi (or some other valid android target) when building with --enable-application=mobile/android.
|
||||
See https://wiki.mozilla.org/Mobile/Fennec/Android#Setup_Fennec_mozconfig for more information about the necessary options])
|
||||
;;
|
||||
esac
|
||||
|
|
@ -6288,9 +6283,9 @@ if test -n "$MOZ_DISABLE_STARTUPCACHE"; then
|
|||
fi
|
||||
AC_SUBST(MOZ_DISABLE_STARTUPCACHE)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable packaging Gaia with B2G desktop and b2gdroid
|
||||
dnl ========================================================
|
||||
dnl =========================================
|
||||
dnl = Enable packaging Gaia with B2G desktop
|
||||
dnl =========================================
|
||||
if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
|
||||
if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
|
||||
AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
|
||||
|
|
@ -6305,10 +6300,6 @@ if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
|
|||
AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
|
||||
fi
|
||||
|
||||
if test "$MOZ_BUILD_APP" = "mobile/android/b2gdroid" -a -z "$GAIADIR"; then
|
||||
AC_MSG_ERROR([GAIADIR needs to be set in b2gdroid builds])
|
||||
fi
|
||||
|
||||
if test -n "$FXOS_SIMULATOR" ; then
|
||||
AC_DEFINE(FXOS_SIMULATOR)
|
||||
AC_SUBST(FXOS_SIMULATOR)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ EXTRA_JS_MODULES['services-common'] += [
|
|||
'utils.js',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' or CONFIG['MOZ_B2GDROID']:
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
|
||||
EXTRA_JS_MODULES['services-common'] += [
|
||||
'hawkclient.js',
|
||||
'hawkrequest.js',
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ DIRS += [
|
|||
'crypto',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' or CONFIG['MOZ_B2GDROID']:
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
|
||||
DIRS += ['fxaccounts']
|
||||
|
||||
if CONFIG['MOZ_SERVICES_SYNC']:
|
||||
DIRS += ['sync']
|
||||
|
||||
if CONFIG['MOZ_B2G'] or CONFIG['MOZ_B2GDROID']:
|
||||
if CONFIG['MOZ_B2G']:
|
||||
DIRS += ['mobileid']
|
||||
|
||||
if CONFIG['MOZ_SERVICES_CLOUDSYNC']:
|
||||
|
|
|
|||
|
|
@ -239,10 +239,6 @@ stage-all: stage-android
|
|||
stage-all: stage-instrumentation-tests
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_BUILD_APP),mobile/android/b2gdroid)
|
||||
stage-all: stage-android
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
|
||||
stage-all: stage-b2g
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -220,13 +220,6 @@ this.AppConstants = Object.freeze({
|
|||
false,
|
||||
#endif
|
||||
|
||||
MOZ_B2GDROID:
|
||||
#ifdef MOZ_B2GDROID
|
||||
true,
|
||||
#else
|
||||
false,
|
||||
#endif
|
||||
|
||||
MOZ_GRAPHENE:
|
||||
#ifdef MOZ_GRAPHENE
|
||||
true,
|
||||
|
|
|
|||
|
|
@ -272,14 +272,6 @@ INNER_MAKE_PACKAGE = \
|
|||
$(INNER_MAKE_GECKOVIEW_LIBRARY)
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_BUILD_APP),mobile/android/b2gdroid)
|
||||
INNER_MAKE_PACKAGE = \
|
||||
$(INNER_SZIP_LIBRARIES) && \
|
||||
cp $(topobjdir)/mobile/android/b2gdroid/app/classes.dex $(ABS_DIST)/classes.dex && \
|
||||
cp $(topobjdir)/mobile/android/b2gdroid/app/b2gdroid-unsigned-unaligned.apk $(ABS_DIST)/gecko.ap_ && \
|
||||
$(INNER_MAKE_APK)
|
||||
endif
|
||||
|
||||
# Language repacks root the resources contained in assets/omni.ja
|
||||
# under assets/, but the repacks expect them to be rooted at /.
|
||||
# Therefore, we we move the omnijar back to / so the resources are
|
||||
|
|
|
|||
|
|
@ -3298,11 +3298,6 @@ NS_IMETHODIMP_(void)
|
|||
nsWindow::SetInputContext(const InputContext& aContext,
|
||||
const InputContextAction& aAction)
|
||||
{
|
||||
#ifdef MOZ_B2GDROID
|
||||
// Disable the Android keyboard on b2gdroid.
|
||||
return;
|
||||
#endif
|
||||
|
||||
nsWindow* top = FindTopLevel();
|
||||
MOZ_ASSERT(top);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче