Backed out 2 changesets (bug 1616630) for Android bustage. CLOSED TREE

Backed out changeset 15016546c954 (bug 1616630)
Backed out changeset dcb7dc51633b (bug 1616630)

browser/app/winlauncher/freestanding/moz.build

@@ -46,6 +46,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
         '%sntdll_freestanding.%s' % (CONFIG['LIB_PREFIX'],
                                      CONFIG['LIB_SUFFIX']),
         script='gen_ntdll_freestanding_lib.py',
+        py2=True,
         inputs=['ntdll_freestanding.def'],
         flags=[CONFIG['LLVM_DLLTOOL']] + CONFIG['LLVM_DLLTOOL_FLAGS'])
 

browser/locales/moz.build

@@ -20,6 +20,7 @@ if CONFIG['MOZ_UPDATER']:
         'en-US/updater/updater.ini',
         '../installer/windows/nsis/updater_append.ini',
     ]
+    updater.py2 = True
     # Yes, this is weird, but what can you do? This file doesn't want to be in the DIST_SUBDIR,
     # but we can't really move it to a different directory until we change how locale repacks
     # work.

build/clang-plugin/moz.build

@@ -62,6 +62,7 @@ if CONFIG['ENABLE_MOZSEARCH_PLUGIN']:
     ]
 
 GeneratedFile('ThirdPartyPaths.cpp', script="ThirdPartyPaths.py",
+              py2=True,
               entry_point="generate", inputs=[
                   '/tools/rewriting/ThirdPartyPaths.txt',
                   '/tools/rewriting/Generated.txt',

build/moz.build

@@ -87,6 +87,7 @@ if CONFIG['MOZ_APP_BASENAME']:
         script='../python/mozbuild/mozbuild/action/preprocessor.py',
         entry_point='generate',
         inputs=['application.ini.in'],
+        py2=True,
         flags=['-D%s=%s' % (k, '1' if v is True else v)
                for k, v in appini_defines.iteritems()])
 
@@ -100,6 +101,7 @@ if CONFIG['MOZ_APP_BASENAME']:
 
 if CONFIG['ENABLE_TESTS']:
     GeneratedFile('automation.py', script='gen_automation.py',
+                  py2=True,
                   inputs=['automation.py.in'])
 
     TEST_HARNESS_FILES.reftest += [

build/test_templates.mozbuild

@@ -24,6 +24,7 @@ def GeneratedTestKey(name):
     if not CONFIG['COMPILE_ENVIRONMENT']:
         return
     GeneratedFile(name, script='/security/manager/ssl/tests/unit/pykey.py',
+                  py2=True,
                   inputs=['%s.keyspec' % name])
     # Turn RELATIVEDIR into list entry: like
     # 'security/manager/ssl/tests/unit/bad_certs' ->

build/unix/elfhack/inject/moz.build

@@ -14,6 +14,7 @@ cpu = CONFIG['CPU_ARCH']
 
 gen_src = '%s.c' % cpu
 GeneratedFile(gen_src, script='copy_source.py', entry_point='copy',
+              py2=True,
               inputs = ['../inject.c'])
 
 SOURCES += [

config/external/ffi/moz.build

@@ -17,6 +17,7 @@ else:
     ]
     GeneratedFile('../../../js/src/ctypes/libffi/include/ffi.h',
                   script='subst_header.py',
+                  py2=True,
                   inputs=['../../../js/src/ctypes/libffi/include/ffi.h.in'])
 
     LOCAL_INCLUDES += [
@@ -85,6 +86,7 @@ else:
                 '!../../../js/src/ctypes/libffi/include/ffi.h',
             ],
             script='preprocess_libffi_asm.py',
+            py2=True,
             flags=['$(DEFINES)', '$(LOCAL_INCLUDES)'])
         SOURCES += ['!win64_aarch.asm']
     elif CONFIG['FFI_TARGET'] == 'X86':
@@ -104,6 +106,7 @@ else:
                 '!../../../js/src/ctypes/libffi/fficonfig.h',
                 '!../../../js/src/ctypes/libffi/include/ffi.h',
             ], script='preprocess_libffi_asm.py',
+            py2=True,
             flags=['$(DEFINES)', '$(LOCAL_INCLUDES)'])
             SOURCES += ['!win32.asm']
             ASFLAGS += ['-safeseh']
@@ -120,6 +123,7 @@ else:
                     '!../../../js/src/ctypes/libffi/fficonfig.h',
                     '!../../../js/src/ctypes/libffi/include/ffi.h',
                 ], script='preprocess_libffi_asm.py',
+                py2=True,
                 flags=['$(DEFINES)', '$(LOCAL_INCLUDES)'])
             SOURCES += ['!win64.asm']
     elif CONFIG['FFI_TARGET'] == 'X86_DARWIN':

config/external/icu/data/moz.build

@@ -25,6 +25,7 @@ LOCAL_INCLUDES += ['.']
 if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'aarch64':
     icudata = 'icudata.asm'
     GeneratedFile(icudata, script='genicudata.py',
+                  py2=True,
                   inputs=[CONFIG['ICU_DATA_FILE']], flags=[data_symbol])
     SOURCES += ['!%s' % icudata]
 elif CONFIG['HAVE_YASM']:

config/moz.build

@@ -62,6 +62,7 @@ if CONFIG['WRAP_STL_INCLUDES']:
         stl.script = 'make-stl-wrappers.py:gen_wrappers'
         stl.flags = [output_dir, stl_compiler, template_file]
         stl.flags.extend(stl_headers)
+        stl.py2 = True
 
     # Wrap <windows.h> to make it easier to use correctly
     # NOTE: If we aren't wrapping STL includes, we're building part of the browser
@@ -71,6 +72,7 @@ if CONFIG['WRAP_STL_INCLUDES']:
         GeneratedFile('../dist/stl_wrappers/windows.h',
                       script='make-windows-h-wrapper.py',
                       entry_point='generate',
+                      py2=True,
                       inputs = ['windows-h-constant.decls.h',
                                 'windows-h-unicode.decls.h',
                                 'windows-h-wrapper.template.h'],
@@ -86,3 +88,4 @@ if CONFIG['WRAP_SYSTEM_INCLUDES']:
     system.flags = [output_dir]
     system.flags.extend(stl_headers)
     system.flags.extend(system_headers)
+    system.py2 = True

devtools/shared/webconsole/moz.build

@@ -20,6 +20,7 @@ for dir in RELATIVEDIR.split('/'):
 base += ["!reserved-js-words.js"]
 
 GeneratedFile('reserved-js-words.js', script='GenerateReservedWordsJS.py',
+              py2=True,
               inputs = ['/js/src/frontend/ReservedWords.h'])
 
 DevToolsModules(

dom/bindings/moz.build

@@ -176,6 +176,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
 if CONFIG['COMPILE_ENVIRONMENT']:
     GeneratedFile('CSS2Properties.webidl',
                   script='GenerateCSS2PropertiesWebIDL.py',
+                  py2=True,
                   entry_point='generate',
                   inputs=[
                       '/dom/webidl/CSS2Properties.webidl.in',

dom/webgpu/ffi/moz.build

@@ -15,6 +15,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     GeneratedFile('wgpu_ffi_generated.h',
                   script='/layout/style/RunCbindgen.py',
                   entry_point='generate',
+                  py2=True,
                   inputs=[
                     '/gfx/wgpu/wgpu-remote',
                   ])

gfx/layers/moz.build

@@ -589,8 +589,10 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
   GeneratedFile('CompositorD3D11Shaders.h', script='d3d11/genshaders.py',
+                py2=True,
                 inputs=['d3d11/shaders.manifest'])
   GeneratedFile('MLGShaders.h', script='d3d11/genshaders.py',
+                py2=True,
                 inputs=['d3d11/mlgshaders/shaders.manifest'])
 
 LOCAL_INCLUDES += [

gfx/webrender_bindings/moz.build

@@ -93,6 +93,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
 
     GeneratedFile('webrender_ffi_generated.h',
                   script='/layout/style/RunCbindgen.py', entry_point='generate',
+                  py2=True,
                   inputs=[
                       '/gfx/webrender_bindings',
                       '/gfx/wr/webrender',

intl/hyphenation/glue/moz.build

@@ -31,3 +31,4 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     generated.inputs = [
         '/third_party/rust/mapped_hyph'
     ]
+    generated.py2 = True

intl/locale/moz.build

@@ -98,9 +98,11 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     ffi_generated.inputs = [
         '/intl/locale/rust/unic-langid-ffi',
     ]
+    ffi_generated.py2 = True
 
     ffi_generated = GENERATED_FILES['fluent_langneg_ffi_generated.h']
     ffi_generated.script = '/layout/style/RunCbindgen.py:generate'
     ffi_generated.inputs = [
         '/intl/locale/rust/fluent-langneg-ffi',
     ]
+    ffi_generated.py2 = True

js/src/build/moz.build

@@ -30,6 +30,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
     # with those in libxul.
     if CONFIG['OS_TARGET'] == 'Linux':
         GeneratedFile('symverscript', script='/build/gen_symverscript.py', 
+                      py2=True,
                       inputs=['symverscript.in'], 
                       flags=[CONFIG['JS_LIBRARY_NAME'].replace('-', '_')])
         SYMBOLS_FILE = '!symverscript'

js/src/gc/moz.build

@@ -21,6 +21,7 @@ GeneratedFile('StatsPhasesGenerated.h',
               py2=True,
               script='GenerateStatsPhases.py', entry_point='generateHeader')
 GeneratedFile('StatsPhasesGenerated.inc',
+              py2=True,
               script='GenerateStatsPhases.py', entry_point='generateCpp')
 
 UNIFIED_SOURCES += [

js/src/jit/moz.build

@@ -240,12 +240,14 @@ elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
 # Generate jit/MOpcodes.h from jit/MIR.h
 GeneratedFile('MOpcodes.h',
               script='GenerateOpcodeFiles.py',
+              py2=True,
               entry_point='generate_mir_header',
               inputs=['MIR.h'])
 
 # Generate jit/LOpcodes.h from jit/LIR.h, jit/shared/LIR-shared.h, and
 # platform-specific LIR files.
 GeneratedFile('LOpcodes.h',
               script='GenerateOpcodeFiles.py',
+              py2=True,
               entry_point='generate_lir_header',
               inputs=lir_inputs)

layout/style/moz.build

@@ -262,10 +262,12 @@ CONTENT_ACCESSIBLE_FILES += [
 
 
 GeneratedFile('nsCSSPropertyID.h', script='GenerateCSSPropertyID.py',
+              py2=True,
               entry_point='generate',
               inputs=['nsCSSPropertyID.h.in', '!ServoCSSPropList.py'])
 GeneratedFile('ServoCSSPropList.h',
               script='GenerateServoCSSPropList.py',
+              py2=True,
               entry_point='generate_header',
               inputs=['!ServoCSSPropList.py'])
 GeneratedFile('ServoCSSPropList.py',
@@ -282,11 +284,13 @@ if CONFIG['COMPILE_ENVIRONMENT']:
 
     GeneratedFile('CompositorAnimatableProperties.h',
                   script='GenerateCompositorAnimatableProperties.py',
+                  py2=True,
                   entry_point='generate',
                   inputs=['!ServoCSSPropList.py'])
     GeneratedFile(
         'CountedUnknownProperties.h',
         script='GenerateCountedUnknownProperties.py',
+        py2=True,
         entry_point='generate',
         inputs=[
             '/servo/components/style/properties/counted_unknown_properties.py',
@@ -302,6 +306,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
                   entry_point='generate',
                   inputs=['!ServoCSSPropList.py'])
     GeneratedFile('ServoStyleConsts.h', script='RunCbindgen.py',
+                  py2=True,
                   entry_point='generate',
                   inputs = ['/servo/ports/geckolib', '/servo/components/style'])
 

layout/style/test/moz.build

@@ -149,4 +149,5 @@ if CONFIG['COMPILE_ENVIRONMENT']:
         'css_properties_like_longhand.js',
         '!host_ListCSSProperties%s' % CONFIG['HOST_BIN_SUFFIX'],
     ]
+    GENERATED_FILES['css_properties.js'].py2 = True
     TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test += ['!css_properties.js']

mobile/android/base/moz.build

@@ -20,3 +20,4 @@ t = ('android_apks',)
 GENERATED_FILES += [t]
 GENERATED_FILES[t].force = True
 GENERATED_FILES[t].script = '/mobile/android/gradle.py:assemble_app'
+GENERATED_FILES[t].py2 = True

modules/libpref/moz.build

@@ -126,6 +126,7 @@ GENERATED_FILES += [gen_all_tuple]
 static_pref_list = GENERATED_FILES[gen_all_tuple]
 static_pref_list.script = 'init/generate_static_pref_list.py:emit_code'
 static_pref_list.inputs = ['init/StaticPrefList.yaml']
+static_pref_list.py2 = True
 
 PYTHON_UNITTEST_MANIFESTS += [
     'test/python.ini',

moz.build

@@ -164,6 +164,7 @@ if not CONFIG['JS_STANDALONE'] or not CONFIG['MOZ_BUILD_APP']:
 
     GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header'
     GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
+    GENERATED_FILES['buildid.h'].py2 = True
     GENERATED_FILES['source-repo.h'].py2 = True
 
     DIRS += [

netwerk/socket/neqo_glue/moz.build

@@ -17,6 +17,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     GeneratedFile('neqo_glue_ffi_generated.h',
                   script='/layout/style/RunCbindgen.py',
                   entry_point='generate',
+                  py2=True,
                   inputs=['/netwerk/socket/neqo_glue'])
 
     EXPORTS.mozilla.net += [

python/mozbuild/mozbuild/backend/fastermake.py

@@ -169,7 +169,6 @@ def consume_finished(self):
         # Add a few necessary variables inherited from configure
         for var in (
             'PYTHON',
-            'PYTHON3',
             'ACDEFINES',
             'MOZ_BUILD_APP',
             'MOZ_WIDGET_TOOLKIT',

security/manager/ssl/moz.build

@@ -226,6 +226,7 @@ LOCAL_INCLUDES += [
 
 GeneratedFile('nsSTSPreloadList.h',
               script='../../../xpcom/ds/tools/make_dafsa.py',
+              py2=True,
               inputs=['nsSTSPreloadList.inc'])
 
 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'

security/manager/ssl/tests/unit/test_signed_apps/moz.build

@@ -14,6 +14,7 @@ def SignedAppFile(name, flags, app_directory='app/'):
     props.script = '/security/manager/ssl/tests/unit/sign_app.py'
     props.inputs = [app_directory]
     props.flags = flags
+    props.py2 = True
     # Turn RELATIVEDIR into list entry: like
     # 'security/manager/ssl/tests/unit/test_signed_apps' ->
     # TEST_HARNESS_FILES.xpcshell.security.manager.ssl.tests.unit.test_signed_apps.

toolkit/components/featuregates/moz.build

@@ -15,4 +15,5 @@ PYTHON_UNITTEST_MANIFESTS += ['test/python/python.ini']
 JAR_MANIFESTS += ['jar.mn']
 
 GeneratedFile('feature_definitions.json', script='gen_feature_definitions.py',
+              py2=True,
               inputs=['Features.toml'])

toolkit/components/normandy/test/browser/moz.build

@@ -21,5 +21,6 @@ for addon in addons:
     GENERATED_FILES += [xpi]
     GENERATED_FILES[xpi].script = '../create_xpi.py'
     GENERATED_FILES[xpi].inputs = [indir]
+    GENERATED_FILES[xpi].py2 = True
 
     output_dir += ['!%s' % xpi]

toolkit/crashreporter/moz.build

@@ -129,6 +129,7 @@ else:
 
 # Generate CrashAnnotations.h
 GeneratedFile('CrashAnnotations.h', script='generate_crash_reporter_sources.py',
+              py2=True,
               entry_point='emit_header', inputs=[
                   'CrashAnnotations.h.in',
                   'CrashAnnotations.yaml',

toolkit/library/moz.build

@@ -85,6 +85,7 @@ def Libxul(name, output_category=None):
     if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
         GeneratedFile('symverscript', script='/build/gen_symverscript.py',
                       inputs=['../symverscript.in'],
+                      py2=True,
                       flags=['xul%s' % CONFIG['MOZILLA_SYMBOLVERSION']])
         SYMBOLS_FILE = '!symverscript'
 
@@ -376,5 +377,6 @@ else:
     libxul_list = '%sxul_%s' % (
         CONFIG['DLL_PREFIX'], CONFIG['DLL_SUFFIX'].lstrip('.').replace('.','_'))
 GeneratedFile('buildid.cpp', script = 'gen_buildid.py',
+              py2=True,
               inputs=['!build/%s.list' % libxul_list])
 

toolkit/locales/moz.build

@@ -15,7 +15,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
 
 JAR_MANIFESTS += ['jar.mn']
 
-GeneratedFile('multilocale.txt', script='gen_multilocale.py')
+GeneratedFile('multilocale.txt', script='gen_multilocale.py', py2=True)
 FINAL_TARGET_FILES.res += [
     '!multilocale.txt',
 ]
@@ -34,4 +34,5 @@ if CONFIG['MOZ_CRASHREPORTER']:
 LOCALIZED_GENERATED_FILES += ['update.locale']
 update_locale = LOCALIZED_GENERATED_FILES['update.locale']
 update_locale.script = 'generate_update_locale.py'
+update_locale.py2 = True
 LOCALIZED_FILES += ['!update.locale']

toolkit/mozapps/extensions/test/browser/moz.build

@@ -26,6 +26,7 @@ for addon in addons:
     GENERATED_FILES += [xpi]
     GENERATED_FILES[xpi].script = '../create_xpi.py'
     GENERATED_FILES[xpi].inputs = [indir]
+    GENERATED_FILES[xpi].py2 = True
 
     output_dir += ['!%s' % xpi]
 

widget/android/bindings/moz.build

@@ -40,6 +40,7 @@ t = tuple(['sdk_bindings'] +
 GENERATED_FILES += [t]
 GENERATED_FILES[t].script = '/mobile/android/gradle.py:generate_sdk_bindings'
 GENERATED_FILES[t].inputs += ['%s-classes.txt' % stem for stem in generated]
+GENERATED_FILES[t].py2 = True
 
 FINAL_LIBRARY = 'xul'
 

widget/android/moz.build

@@ -82,6 +82,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 GeneratedFile(
     'generated_jni_wrappers', 'GeneratedJNINatives.h', 'GeneratedJNIWrappers.h',
     'GeneratedJNIWrappers.cpp', script='/mobile/android/gradle.py',
+    py2=True,
     entry_point='generate_generated_jni_wrappers')
 
 FINAL_LIBRARY = 'xul'

xpcom/base/moz.build

@@ -226,6 +226,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
 
     GeneratedFile('gk_rust_utils_ffi_generated.h',
                   script='/layout/style/RunCbindgen.py',
+                  py2=True,
                   entry_point='generate', inputs=['/xpcom/rust/gkrust_utils'])
 
 include('/ipc/chromium/chromium-config.mozbuild')

xpcom/build/moz.build

@@ -70,9 +70,9 @@ if CONFIG['OS_ARCH'] != 'WINNT':
         'NSPRInterposer.cpp',
     ]
 
-GeneratedFile('Services.cpp', script='Services.py', entry_point='services_cpp')
-GeneratedFile('Services.h', script='Services.py', entry_point='services_h')
-GeneratedFile('services.rs', script='Services.py', entry_point='services_rs')
+GeneratedFile('Services.cpp', script='Services.py', entry_point='services_cpp', py2=True)
+GeneratedFile('Services.h', script='Services.py', entry_point='services_h', py2=True)
+GeneratedFile('services.rs', script='Services.py', entry_point='services_rs', py2=True)
 
 include('/ipc/chromium/chromium-config.mozbuild')