Bug 1314546 - Always putenv(MOZ_LINKER_EXTRACT) for Android r=esawin,…

…glandium This allows artifact builds to load the new compressed native libraries correctly, without requiring build config changes. MozReview-Commit-ID: 3xZzoV3wFda --HG-- extra : rebase_source : 5fffe02efc38af9024ca72654153deed3c4ef757
dothq · Nov 4, 2016 · b78c01d · b78c01d
1 parent 8b80e11
commit b78c01d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
@@ -278,13 +278,6 @@ public class AppConstants {
     false;
 //#endif
 
-    public static final boolean MOZ_LINKER_EXTRACT =
-//#ifdef MOZ_LINKER_EXTRACT
-    true;
-//#else
-    false;
-//#endif
-
     public static final boolean MOZ_DRAGGABLE_URLBAR = false;
 
     public static final boolean MOZ_INSTALL_TRACKING =

diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
@@ -1069,7 +1069,7 @@ if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']:
 # We do not expose MOZ_ADJUST_SDK_KEY here because that # would leak the value
 # to build logs.  Instead we expose the token quietly where appropriate in
 # Makefile.in.
-for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZ_DEBUG',
+for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
             'MOZ_ANDROID_DOWNLOADS_INTEGRATION', 'MOZ_INSTALL_TRACKING',
             'MOZ_ANDROID_GCM', 'MOZ_ANDROID_EXCLUDE_FONTS', 'MOZ_LOCALE_SWITCHER',

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
@@ -199,15 +199,13 @@ private static void loadLibsSetupLocked(Context context) {
             }
         }
 
-        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);
-            }
+        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);
         }
     }