Bug 1257434 - Move --enable-systrace to moz.configure. r=ted

build/moz.configure/init.configure

@@ -261,6 +261,7 @@ def wanted_mozconfig_variables(help):
          'MOZ_BUILD_APP',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
+         'MOZ_USE_SYSTRACE',
          'MOZTTDIR',
          'PERL',
          'RPMBUILD',

build/moz.configure/old.configure

@@ -274,7 +274,6 @@ def old_configure_options(*options):
     '--enable-system-hunspell',
     '--enable-system-pixman',
     '--enable-system-sqlite',
-    '--enable-systrace',
     '--enable-tasktracer',
     '--enable-tests',
     '--enable-thread-sanitizer',

old-configure.in

@@ -1194,17 +1194,6 @@ MOZ_ARG_ENABLE_BOOL(profiling,
     MOZ_PROFILING=1,
     MOZ_PROFILING= )
 
-dnl ========================================================
-dnl = Turn on systrace for android/b2g.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(systrace,
-[  --enable-systrace       Set compile flags necessary for using sampling profilers (e.g. shark, perf)],
-    MOZ_USE_SYSTRACE=1,
-    MOZ_USE_SYSTRACE= )
-if test -n "$MOZ_USE_SYSTRACE"; then
-    AC_DEFINE(MOZ_USE_SYSTRACE)
-fi
-
 dnl ========================================================
 dnl = Use Valgrind
 dnl ========================================================

toolkit/moz.configure

@@ -4,6 +4,25 @@
 # 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/.
 
+
+# Profiling
+# ==============================================================
+# Some of the options here imply an option from js/moz.configure,
+# so, need to be declared before the include.
+option('--enable-systrace', env='MOZ_USE_SYSTRACE',
+       help='Turn on systrace for the Gecko profiler on android/b2g')
+
+@depends('--enable-systrace', target)
+def systrace(value, target):
+    if value and target.os != 'Android':
+        error('--enable-systrace cannot be used when targetting %s'
+              % target.os)
+    if value:
+        set_define('MOZ_USE_SYSTRACE', '1')
+
+
+# Javascript engine
+# ==============================================================
 include('../js/moz.configure')