Apply patches.

Author: jdm

mozjs/build/moz.configure/android-ndk.configure

@@ -8,6 +8,15 @@
 js_option('--with-android-ndk', nargs=1,
           help='location where the Android NDK can be found')
 
+js_option('--with-android-ndk-version', nargs=1,
+          help='android NDK version')
+
+js_option('--with-android-platform', nargs=1,
+          help='location of the Android platform')
+
+js_option('--with-android-clang', nargs=1,
+          help='location of the Android clang compiler')
+
 js_option('--with-android-toolchain', nargs=1,
           help='location of the Android toolchain')
 
@@ -63,13 +72,17 @@ set_config('ANDROID_NDK', ndk)
 add_old_configure_assignment('android_ndk', ndk)
 
 
-@depends(ndk)
+@depends('--with-android-ndk-version', ndk)
 @checking('for android ndk version')
 @imports(_from='__builtin__', _import='open')
-def ndk_version(ndk):
+def ndk_version(value, ndk):
     if not ndk:
         # Building 'js/src' for non-Android.
         return
+
+    if value:
+        return value[0]
+
     with open(os.path.join(ndk, 'source.properties'), 'r') as f:
         for line in f:
             if not line.startswith('Pkg.Revision'):
@@ -109,13 +122,16 @@ def ndk_minor_version(ndk_version):
 set_config('ANDROID_NDK_MINOR_VERSION', ndk_minor_version)
 
 
-@depends(target, android_version, ndk)
+@depends('--with-android-platform', target, android_version, ndk)
 @checking('for android platform directory')
 @imports(_from='os.path', _import='isdir')
-def android_platform(target, android_version, ndk):
+def android_platform(value, target, android_version, ndk):
     if target.os != 'Android':
         return
 
+    if value:
+        return value[0]
+
     if 'aarch64' == target.cpu:
         target_dir_name = 'arm64'
     else:
@@ -252,7 +268,7 @@ js_option(env='STLPORT_CPPFLAGS',
 @imports(_from='os.path', _import='isdir')
 def stlport_cppflags(value, ndk):
     if value and len(value):
-        return value.split()
+        return value[0].split()
     if not ndk:
         return
 
@@ -296,6 +312,8 @@ def extra_toolchain_flags(android_system, android_sysroot, toolchain_dir,
              android_system,
              '-isystem',
              os.path.join(android_sysroot, 'usr', 'include'),
+             '--sysroot',
+             android_sysroot,
              '-gcc-toolchain',
              toolchain_dir,
              '-D__ANDROID_API__=%d' % android_version]
@@ -332,13 +350,16 @@ def bindgen_cflags_android(toolchain_flags, toolchain, toolchain_prefix):
     ]
 
 
-@depends(host, ndk)
+@depends('--with-android-clang', host, ndk)
 @imports(_from='os.path', _import='exists')
 @imports(_from='os.path', _import='isdir')
-def android_clang_compiler(host, ndk):
+def android_clang_compiler(value, host, ndk):
     if not ndk:
         return
 
+    if value:
+        return value[0]
+
     llvm_format = '%s/toolchains/llvm/prebuilt/%s-%s/bin'
     llvm_path = llvm_format % (ndk, host.kernel.lower(), host.cpu)
     if not isdir(llvm_path) and host.cpu == 'x86_64':

mozjs/build/moz.configure/toolchain.configure

@@ -1298,8 +1298,14 @@ set_config('COLOR_CFLAGS', color_cflags)
 # hidden visibility.
 
 
-@depends(c_compiler, target)
-def libcxx_override_visibility(c_compiler, target):
+option(env='_LIBCPP_INLINE_VISIBILITY',
+       nargs=1,
+       help='Visibility of libc++ inlines')
+
+@depends('_LIBCPP_INLINE_VISIBILITY', c_compiler, target)
+def libcxx_override_visibility(value, c_compiler, target):
+    if len(value):
+        return value[0]
     if c_compiler.type == 'clang' and target.os == 'Android':
         return ''
 

mozjs/config/external/nspr/moz.build

@@ -18,11 +18,12 @@ if CONFIG['MOZ_BUILD_NSPR']:
             'nss',
         ]
     else:
-        USE_LIBS += [
-            'nspr4',
-            'plc4',
-            'plds4',
-        ]
+        #USE_LIBS += [
+        #    'nspr4',
+        #    'plc4',
+        #    'plds4',
+        #]
+        pass
     EXPORTS.nspr += ['prcpucfg.h']
 else:
     OS_LIBS += CONFIG['NSPR_LIBS']

mozjs/config/system-headers.mozbuild

@@ -1048,7 +1048,7 @@ system_headers = [
     'zmouse.h',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+if CONFIG['OS_TARGET'] == 'Android':
     system_headers += [
         'android/api-level.h',
         'android/ashmem.h',

mozjs/js/src/build/moz.build

@@ -38,6 +38,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
         SYMBOLS_FILE = '!symverscript'
 else:
     Library('js')
+    USE_LIBS += ['mozglue']
 
 FORCE_STATIC_LIB = True
 STATIC_LIBRARY_NAME = 'js_static'

mozjs/mfbt/GuardObjects.h

@@ -96,7 +96,7 @@ class GuardObjectNotifier {
   }
 };
 
-class GuardObjectNotificationReceiver {
+class alignas(8) GuardObjectNotificationReceiver {
  private:
   bool mStatementDone;
 

mozjs/moz.build

@@ -137,6 +137,6 @@ if CONFIG['MOZ_BUILD_APP']:
 else:
     include('/toolkit/toolkit.mozbuild')
 
-CONFIGURE_SUBST_FILES += ['.cargo/config']
+#CONFIGURE_SUBST_FILES += ['.cargo/config']
 
 include('build/templates.mozbuild')

mozjs/mozglue/build/BionicGlue.cpp

@@ -17,7 +17,7 @@
 
 #define NS_EXPORT __attribute__((visibility("default")))
 
-#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID)
+#if __ANDROID_API__ < 17 || defined(MOZ_WIDGET_ANDROID)
 /* Android doesn't have pthread_atfork(), so we need to use our own. */
 struct AtForkFuncs {
   void (*prepare)(void);
@@ -65,7 +65,7 @@ struct SpecialAllocator : public std::allocator<T> {
 static std::vector<AtForkFuncs, SpecialAllocator<AtForkFuncs> > atfork;
 #endif
 
-#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID)
+#if __ANDROID_API__ < 17 || defined(MOZ_WIDGET_ANDROID)
 extern "C" NS_EXPORT int pthread_atfork(void (*prepare)(void),
                                         void (*parent)(void),
                                         void (*child)(void)) {

mozjs/python/mozbuild/mozbuild/frontend/emitter.py

@@ -1142,7 +1142,7 @@ def emit_from_context(self, context):
             generated_files.add(str(sub.relpath))
             yield sub
 
-        for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags, computed_as_flags)),
+        for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags,)),
                                                 ('HOST_DEFINES', HostDefines, (computed_host_flags,))):
             defines = context.get(defines_var)
             if defines: