Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1102488 - Part 2: Don't preprocess GeckoLoader. r=rnewman

Browse Source 
I replaced the compile-time ANDROID_PACKAGE_NAME with the run-time
context.getPackageName() for two reasons:

1) I claim this is more correct.  It's hard to imagine Fennec working
with ANDROID_PACKAGE_NAME != context.getPackageName(), but right here
we should use the run-time, not the build-time state.

2) GeckoLoader is part of GeckoView, and as such it shouldn't assume
anything about the package it's running as.

GeckoView consumers may ship for multiple architectures, so we
shouldn't assume anything about the build-time architecture, but the
reference to MOZ_CPU_ABI is purely diagnostic.  There are substantive
changes to make here; we'll cross that bridge some other time.

--HG--
extra : source : 48fc328377d41596900fa924b21378ba65a0df1f
This commit is contained in:
Nick Alexander 2014-11-20 14:39:10 -08:00
parent e2afa5c3c1
commit fc649a2992
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/AppConstants.java.in
View File

@ -265,4 +265,11 @@ public class AppConstants {
//#else
false;
//#endif
public static final boolean MOZ_LINKER_EXTRACT =
//#ifdef MOZ_LINKER_EXTRACT
true;
//#else
false;
//#endif
}

5
mobile/android/base/moz.build
View File

@ -36,6 +36,7 @@ mgjar.sources += [
'mozglue/ByteBufferInputStream.java',
'mozglue/ContextUtils.java',
'mozglue/DirectBufferAllocator.java',
'mozglue/GeckoLoader.java',
'mozglue/generatorannotations/OptionalGeneratedParameter.java',
'mozglue/generatorannotations/WrapElementForJNI.java',
'mozglue/generatorannotations/WrapEntireClassForJNI.java',
@ -45,9 +46,7 @@ mgjar.sources += [
'mozglue/RobocopTarget.java',
'mozglue/WebRTCJNITarget.java',
]
mgjar.generated_sources += [
'org/mozilla/gecko/mozglue/GeckoLoader.java',
]
mgjar.generated_sources = [] # Keep it this way.
mgjar.extra_jars += [
'constants.jar',
]

41
mobile/android/base/mozglue/GeckoLoader.java.in → mobile/android/base/mozglue/GeckoLoader.java
View File

@ -1,4 +1,3 @@
//#filter substitution
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* 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
@ -22,15 +21,12 @@ import android.os.Build;
import android.os.Environment;
import android.util.Log;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent;
public final class GeckoLoader {
private static final String LOGTAG = "GeckoLoader";
// These match AppConstants, but we're built earlier.
private static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@";
private static final String MOZ_APP_ABI = "@MOZ_APP_ABI@";
private static volatile SafeIntent sIntent;
private static File sCacheFile;
private static File sGREDir;
@ -228,16 +224,16 @@ public final class GeckoLoader {
}
}
//#ifdef MOZ_LINKER_EXTRACT
putenv("MOZ_LINKER_EXTRACT=1");
// Ensure that the cache dir is world-writable
File cacheDir = new File(linkerCache);
if (cacheDir.isDirectory()) {
cacheDir.setWritable(true, false);
cacheDir.setExecutable(true, false);
cacheDir.setReadable(true, false);
if (AppConstants.MOZ_LINKER_EXTRACT) {
putenv("MOZ_LINKER_EXTRACT=1");
// Ensure that the cache dir is world-writable
File cacheDir = new File(linkerCache);
if (cacheDir.isDirectory()) {
cacheDir.setWritable(true, false);
cacheDir.setExecutable(true, false);
cacheDir.setReadable(true, false);
}
}
//#endif
}
@RobocopTarget
@ -357,15 +353,17 @@ public final class GeckoLoader {
}
private static String getLoadDiagnostics(final Context context, final String lib) {
final String androidPackageName = context.getPackageName();
final StringBuilder message = new StringBuilder("LOAD ");
message.append(lib);
// These might differ. If so, we know why the library won't load!
message.append(": ABI: " + MOZ_APP_ABI + ", " + getCPUABI());
message.append(": ABI: " + AppConstants.MOZ_APP_ABI + ", " + getCPUABI());
message.append(": Data: " + context.getApplicationInfo().dataDir);
try {
final boolean appLibExists = new File("/data/app-lib/" + ANDROID_PACKAGE_NAME + "/lib" + lib + ".so").exists();
final boolean dataDataExists = new File("/data/data/" + ANDROID_PACKAGE_NAME + "/lib/lib" + lib + ".so").exists();
final boolean appLibExists = new File("/data/app-lib/" + androidPackageName + "/lib" + lib + ".so").exists();
final boolean dataDataExists = new File("/data/data/" + androidPackageName + "/lib/lib" + lib + ".so").exists();
message.append(", ax=" + appLibExists);
message.append(", ddx=" + dataDataExists);
} catch (Throwable e) {
@ -373,8 +371,8 @@ public final class GeckoLoader {
}
try {
final String dashOne = "/data/data/" + ANDROID_PACKAGE_NAME + "-1";
final String dashTwo = "/data/data/" + ANDROID_PACKAGE_NAME + "-2";
final String dashOne = "/data/data/" + androidPackageName + "-1";
final String dashTwo = "/data/data/" + androidPackageName + "-2";
final boolean dashOneExists = new File(dashOne).exists();
final boolean dashTwoExists = new File(dashTwo).exists();
message.append(", -1x=" + dashOneExists);
@ -475,12 +473,13 @@ public final class GeckoLoader {
}
// Attempt 4: use /data/app-lib directly. This is a last-ditch effort.
if (attemptLoad("/data/app-lib/" + ANDROID_PACKAGE_NAME + "/lib" + lib + ".so")) {
final String androidPackageName = context.getPackageName();
if (attemptLoad("/data/app-lib/" + androidPackageName + "/lib" + lib + ".so")) {
return;
}
// Attempt 5: even more optimistic.
if (attemptLoad("/data/data/" + ANDROID_PACKAGE_NAME + "/lib/lib" + lib + ".so")) {
if (attemptLoad("/data/data/" + androidPackageName + "/lib/lib" + lib + ".so")) {
return;
}