Bug 1124052 - Part 0: Don't preprocess SysInfo. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Tue, 20 Jan 2015 21:20:48 -0800
changeset 225007 40385ec275b73ce7a10928b3ed9cba9b8c28290d
parent 225006 df2f2df820a87aa5ba51cdac94cbeb7565d32b8a
child 225008 0ebf567bee4bc342a8104b4d6722d055096065b3
push idunknown
push userunknown
push dateunknown
reviewersrnewman
bugs1124052
milestone38.0a1
Bug 1124052 - Part 0: Don't preprocess SysInfo. r=rnewman
mobile/android/base/SysInfo.java
mobile/android/base/SysInfo.java.in
mobile/android/base/moz.build
rename from mobile/android/base/SysInfo.java.in
rename to mobile/android/base/SysInfo.java
--- a/mobile/android/base/SysInfo.java.in
+++ b/mobile/android/base/SysInfo.java
@@ -1,9 +1,8 @@
-//#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
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import android.os.StrictMode;
@@ -221,23 +220,16 @@ public final class SysInfo {
      * @return the system OS name. Hardcoded to "Android".
      */
     public static String getName() {
         // We deliberately differ from PR_SI_SYSNAME, which is "Linux".
         return "Android";
     }
 
     /**
-     * @return the architecture string, excluding ABI.
-     */
-    public static String getArch() {
-        return "@CPU_ARCH@";   // "arm"
-    }
-
-    /**
      * @return the Android architecture string, including ABI.
      */
     public static String getArchABI() {
         // Android likes to include the ABI, too ("armeabiv7"), so we
         // differ to add value.
         return android.os.Build.CPU_ABI;
     }
 }
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -7,20 +7,21 @@
 DIRS += ['locales']
 SPHINX_TREES['fennec'] = 'docs'
 
 include('android-services.mozbuild')
 
 thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
 
 constants_jar = add_java_jar('constants')
-constants_jar.sources = []
+constants_jar.sources = [
+    'SysInfo.java',
+]
 constants_jar.generated_sources = [
     'preprocessed/org/mozilla/gecko/AppConstants.java',
-    'preprocessed/org/mozilla/gecko/SysInfo.java',
 ]
 constants_jar.generated_sources += ['preprocessed/org/mozilla/gecko/' + f for f in sync_generated_java_files]
 
 resjar = add_java_jar('gecko-R')
 resjar.sources = []
 resjar.generated_sources += [
     'org/mozilla/gecko/R.java',
 ]
@@ -674,17 +675,17 @@ for var in ('MOZ_ANDROID_ANR_REPORTER', 
             'MOZ_ANDROID_NEW_TABLET_UI'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
 for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL'):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
-for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH', 'CPU_ARCH',
+for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
             'GRE_MILESTONE', 'MOZ_APP_BASENAME',
             'MOZ_APP_DISPLAYNAME', 'MOZ_APP_ID', 'MOZ_APP_NAME',
             'MOZ_APP_VENDOR', 'MOZ_APP_VERSION', 'MOZ_CHILD_PROCESS_NAME',
             'MOZ_CRASHREPORTER', 'MOZ_UPDATE_CHANNEL', 'OMNIJAR_NAME',
             'OS_TARGET', 'TARGET_XPCOM_ABI'):
     DEFINES[var] = CONFIG[var]
 
 # Mangle our package name to avoid Bug 750548.