Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 03:05:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1531632 - Initialize environment variables before loading libxul. r=snorp

Browse Source 
There are at least two known side effects of initializing it after
loading libxul:
- We can't set LLVM_PROFILE_FILE for the instrumentation part of PGO to
  make the compiler-rt static initializer pick it.
- We can't set MOZ_DEBUG_LINKER to enable the linker debug log (which
  used to work when environment variables were set earlier).

Differential Revision: https://phabricator.services.mozilla.com/D21646

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-03-08 01:37:44 +00:00
parent ef8332d769
commit 544e602cee
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
View File

@ -271,9 +271,6 @@ public class GeckoThread extends Thread {
private static void initGeckoEnvironment() {
final Context context = GeckoAppShell.getApplicationContext();
GeckoLoader.loadMozGlue(context);
setState(State.MOZGLUE_READY);
final Locale locale = Locale.getDefault();
final Resources res = context.getResources();
if (locale.toString().equalsIgnoreCase("zh_hk")) {
@ -414,11 +411,9 @@ public class GeckoThread extends Thread {
};
Looper.myQueue().addIdleHandler(idleHandler);
initGeckoEnvironment();
// Wait until initialization before calling Gecko entry point.
// Wait until initialization before preparing environment.
synchronized (this) {
while (!mInitialized || !isState(State.LIBS_READY)) {
while (!mInitialized) {
try {
wait();
} catch (final InterruptedException e) {
@ -426,6 +421,30 @@ public class GeckoThread extends Thread {
}
}
final Context context = GeckoAppShell.getApplicationContext();
final List<String> env = getEnvFromExtras(mInitInfo.extras);
// In Gecko, the native crash reporter is enabled by default in opt builds, and
// disabled by default in debug builds.
if ((mInitInfo.flags & FLAG_ENABLE_NATIVE_CRASHREPORTER) == 0 && !BuildConfig.DEBUG_BUILD) {
env.add(0, "MOZ_CRASHREPORTER_DISABLE=1");
} else if ((mInitInfo.flags & FLAG_ENABLE_NATIVE_CRASHREPORTER) != 0 && BuildConfig.DEBUG_BUILD) {
env.add(0, "MOZ_CRASHREPORTER=1");
}
if (!isChildProcess() && ((mInitInfo.flags & FLAG_ENABLE_MARIONETTE) != 0)) {
// The presence of this environment variable determines the initial
// value of `marionette.enabled`.
env.add(0, "MOZ_MARIONETTE=1");
}
GeckoLoader.loadMozGlue(context);
setState(State.MOZGLUE_READY);
GeckoLoader.setupGeckoEnvironment(context, context.getFilesDir().getPath(), env, mInitInfo.prefs);
initGeckoEnvironment();
if ((mInitInfo.flags & FLAG_PRELOAD_CHILD) != 0) {
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
@ -445,31 +464,12 @@ public class GeckoThread extends Thread {
Log.w(LOGTAG, "zerdatime " + SystemClock.elapsedRealtime() + " - runGecko");
final Context context = GeckoAppShell.getApplicationContext();
final String[] args = isChildProcess() ? mInitInfo.args : getMainProcessArgs();
if ((mInitInfo.flags & FLAG_DEBUGGING) != 0) {
Log.i(LOGTAG, "RunGecko - args = " + TextUtils.join(" ", args));
}
final List<String> env = getEnvFromExtras(mInitInfo.extras);
// In Gecko, the native crash reporter is enabled by default in opt builds, and
// disabled by default in debug builds.
if ((mInitInfo.flags & FLAG_ENABLE_NATIVE_CRASHREPORTER) == 0 && !BuildConfig.DEBUG_BUILD) {
env.add(0, "MOZ_CRASHREPORTER_DISABLE=1");
} else if ((mInitInfo.flags & FLAG_ENABLE_NATIVE_CRASHREPORTER) != 0 && BuildConfig.DEBUG_BUILD) {
env.add(0, "MOZ_CRASHREPORTER=1");
}
if (!isChildProcess() && ((mInitInfo.flags & FLAG_ENABLE_MARIONETTE) != 0)) {
// The presence of this environment variable determines the initial
// value of `marionette.enabled`.
env.add(0, "MOZ_MARIONETTE=1");
}
GeckoLoader.setupGeckoEnvironment(context, context.getFilesDir().getPath(), env, mInitInfo.prefs);
// And go.
GeckoLoader.nativeRun(args,
mInitInfo.extras.getInt(EXTRA_PREFS_FD, -1),