Bug 1545537 - Add 'android' as a jsshell buildConfiguration property. r=sstangl
authorTed Campbell <tcampbell@mozilla.com>
Wed, 01 May 2019 22:06:53 +0000
changeset 531036 16aee8bebc477f1aa17f68bd43d3e1f1a2e7bc6a
parent 531035 5a252b843ac859633e95127a25727ba42df1c07d
child 531037 9c775e06b5f7102562075e8c5d7a33e21c7ef0ca
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstangl
bugs1545537
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1545537 - Add 'android' as a jsshell buildConfiguration property. r=sstangl Differential Revision: https://phabricator.services.mozilla.com/D28842
js/src/builtin/TestingFunctions.cpp
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -223,16 +223,25 @@ static bool GetBuildConfiguration(JSCont
   value = BooleanValue(true);
 #else
   value = BooleanValue(false);
 #endif
   if (!JS_SetProperty(cx, info, "arm-simulator", value)) {
     return false;
   }
 
+#ifdef ANDROID
+  value = BooleanValue(true);
+#else
+  value = BooleanValue(false);
+#endif
+  if (!JS_SetProperty(cx, info, "android", value)) {
+    return false;
+  }
+
 #ifdef JS_CODEGEN_ARM64
   value = BooleanValue(true);
 #else
   value = BooleanValue(false);
 #endif
   if (!JS_SetProperty(cx, info, "arm64", value)) {
     return false;
   }