зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 3 changesets (bug 1611554) for causing bustage on recurse.mk. CLOSED TREE
Backed out changeset bb1ce63d73ec (bug 1611554) Backed out changeset 0d4317da1006 (bug 1611554) Backed out changeset dc905e5db0cc (bug 1611554)
This commit is contained in:
Butkovits Atila
Родитель
26101454bb
Коммит
bcdf48f6d6
|
|
@ -171,9 +171,6 @@ widget/android/export: mobile/android/base/export
|
|||
# android_apks is not built on artifact builds without this dependency.
|
||||
mobile/android/base/export: mobile/android/base/android_apks
|
||||
|
||||
# This is required so that the pre-export tier sees the rules in mobile/android/base
|
||||
recurse_pre-export:: mobile/android/base/pre-export
|
||||
|
||||
# CSS2Properties.webidl needs ServoCSSPropList.py from layout/style
|
||||
dom/bindings/export: layout/style/ServoCSSPropList.py
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
from __future__ import absolute_import, print_function
|
||||
|
||||
from jinja2 import Environment, FileSystemLoader, StrictUndefined
|
||||
import os
|
||||
|
||||
|
||||
def main(output_fd, input_filename, *args):
|
||||
# FileSystemLoader requires the path to the directory containing templates,
|
||||
# not the file name of the template itself. We hang onto the leaf name
|
||||
# which will shortly be passed to Environment.get_template.
|
||||
(path, leaf) = os.path.split(input_filename)
|
||||
|
||||
# Jinja's default value for undefined is too permissive and would allow
|
||||
# omissions to slip into the generated output. We set undefined to
|
||||
# StrictUndefined to force Jinja to raise an exception any time a required
|
||||
# value is missing.
|
||||
env = Environment(
|
||||
loader=FileSystemLoader(path, encoding="utf-8"),
|
||||
autoescape=True,
|
||||
undefined=StrictUndefined,
|
||||
)
|
||||
tpl = env.get_template(leaf)
|
||||
|
||||
context = dict()
|
||||
|
||||
# args should all be key=value pairs that will be added to the context.
|
||||
# Note that all values are *strings*, so the Jinja template may need to
|
||||
# convert them to other types during processing.
|
||||
# (As in Python, the empty string is falsy, so simple boolean checks are possible)
|
||||
for arg in args:
|
||||
(k, v) = arg.split("=", 1)
|
||||
context[k] = v
|
||||
|
||||
# Now run the template and send its output directly to output_fd
|
||||
tpl.stream(context).dump(output_fd, encoding="utf-8")
|
||||
|
|
@ -17,31 +17,3 @@ t = ("android_apks",)
|
|||
GENERATED_FILES += [t]
|
||||
GENERATED_FILES[t].force = True
|
||||
GENERATED_FILES[t].script = "/mobile/android/gradle.py:assemble_app"
|
||||
|
||||
# The Android APKs are assembled in the `export` tier, which usually occurs
|
||||
# before the following files are generated. However, mechanisms in `recurse.mk`
|
||||
# are used to pull the generated files into the `pre-export` tier, so do not
|
||||
# require an explicit dependency here.
|
||||
config_keys = (
|
||||
"MOZ_ANDROID_CONTENT_SERVICE_COUNT",
|
||||
"MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS",
|
||||
)
|
||||
flags = ["%s=%s" % (k, CONFIG[k] if CONFIG[k] else "") for k in config_keys]
|
||||
|
||||
GeneratedFile(
|
||||
("../geckoview/src/main/AndroidManifest_overlay.xml",),
|
||||
script="gen_from_jinja.py",
|
||||
inputs=["../geckoview/src/main/AndroidManifest_overlay.jinja"],
|
||||
flags=flags,
|
||||
)
|
||||
|
||||
GeneratedFile(
|
||||
(
|
||||
"../geckoview/src/main/java/org/mozilla/gecko/process/GeckoChildProcessServices.java",
|
||||
),
|
||||
script="gen_from_jinja.py",
|
||||
inputs=[
|
||||
"../geckoview/src/main/java/org/mozilla/gecko/process/GeckoChildProcessServices.jinja"
|
||||
],
|
||||
flags=flags,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -158,8 +158,6 @@ android {
|
|||
srcDir "${topsrcdir}/third_party/libwebrtc/webrtc/sdk/android"
|
||||
srcDir "${topsrcdir}/third_party/libwebrtc/webrtc/rtc_base/java"
|
||||
}
|
||||
|
||||
srcDir "${topobjdir}/mobile/android/geckoview/src/main/java"
|
||||
}
|
||||
|
||||
resources {
|
||||
|
|
@ -172,14 +170,6 @@ android {
|
|||
|
||||
assets {
|
||||
}
|
||||
|
||||
debug {
|
||||
manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
|
||||
}
|
||||
|
||||
release {
|
||||
manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@
|
|||
android:required="true"/>
|
||||
|
||||
<application>
|
||||
|
||||
<!-- New child services must also be added to the Fennec AndroidManifest.xml.in -->
|
||||
<service
|
||||
android:name="org.mozilla.gecko.media.MediaManager"
|
||||
android:enabled="true"
|
||||
|
|
@ -57,6 +59,58 @@
|
|||
android:isolatedProcess="false"
|
||||
android:process=":gmplugin">
|
||||
</service>
|
||||
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab0" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab0"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab1" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab1"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab2" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab2"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab3" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab3"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab4" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab4"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab5" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab5"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab6" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab6"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab7" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab7"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab8" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab8"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab9" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab9"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab10" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab10"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab11" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab11"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab12" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab12"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab13" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab13"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab14" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab14"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab15" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab15"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab16" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab16"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab17" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab17"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab18" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab18"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab19" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab19"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab20" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab20"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab21" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab21"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab22" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab22"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab23" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab23"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab24" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab24"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab25" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab25"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab26" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab26"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab27" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab27"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab28" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab28"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab29" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab29"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab30" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab30"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab31" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab31"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab32" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab32"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab33" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab33"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab34" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab34"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab35" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab35"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab36" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab36"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab37" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab37"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab38" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab38"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab39" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab39"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab40" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab40"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab41" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab41"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab42" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab42"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab43" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab43"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab44" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab44"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab45" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab45"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab46" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab46"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab47" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab47"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab48" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab48"></service>
|
||||
<service android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab49" android:enabled="true" android:exported="false" android:isolatedProcess="false" android:process=":tab49"></service>
|
||||
|
||||
<service
|
||||
android:name="org.mozilla.gecko.process.GeckoChildProcessServices$socket"
|
||||
android:enabled="true"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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/. -->
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mozilla.geckoview">
|
||||
<application>
|
||||
{% for id in range(0, MOZ_ANDROID_CONTENT_SERVICE_COUNT | int) %}
|
||||
<service
|
||||
android:name="org.mozilla.gecko.process.GeckoChildProcessServices$tab{{ id }}"
|
||||
android:enabled="true"
|
||||
android:exported="false"
|
||||
android:isolatedProcess="{{ 'true' if MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS else 'false' }}"
|
||||
android:process=":tab{{ id }}">
|
||||
</service>
|
||||
{% endfor %}
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; 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.process;
|
||||
|
||||
public class GeckoChildProcessServices {
|
||||
public static final class gmplugin extends GeckoServiceChildProcess {}
|
||||
public static final class socket extends GeckoServiceChildProcess {}
|
||||
|
||||
public static final class tab0 extends GeckoServiceChildProcess {}
|
||||
public static final class tab1 extends GeckoServiceChildProcess {}
|
||||
public static final class tab2 extends GeckoServiceChildProcess {}
|
||||
public static final class tab3 extends GeckoServiceChildProcess {}
|
||||
public static final class tab4 extends GeckoServiceChildProcess {}
|
||||
public static final class tab5 extends GeckoServiceChildProcess {}
|
||||
public static final class tab6 extends GeckoServiceChildProcess {}
|
||||
public static final class tab7 extends GeckoServiceChildProcess {}
|
||||
public static final class tab8 extends GeckoServiceChildProcess {}
|
||||
public static final class tab9 extends GeckoServiceChildProcess {}
|
||||
public static final class tab10 extends GeckoServiceChildProcess {}
|
||||
public static final class tab11 extends GeckoServiceChildProcess {}
|
||||
public static final class tab12 extends GeckoServiceChildProcess {}
|
||||
public static final class tab13 extends GeckoServiceChildProcess {}
|
||||
public static final class tab14 extends GeckoServiceChildProcess {}
|
||||
public static final class tab15 extends GeckoServiceChildProcess {}
|
||||
public static final class tab16 extends GeckoServiceChildProcess {}
|
||||
public static final class tab17 extends GeckoServiceChildProcess {}
|
||||
public static final class tab18 extends GeckoServiceChildProcess {}
|
||||
public static final class tab19 extends GeckoServiceChildProcess {}
|
||||
public static final class tab20 extends GeckoServiceChildProcess {}
|
||||
public static final class tab21 extends GeckoServiceChildProcess {}
|
||||
public static final class tab22 extends GeckoServiceChildProcess {}
|
||||
public static final class tab23 extends GeckoServiceChildProcess {}
|
||||
public static final class tab24 extends GeckoServiceChildProcess {}
|
||||
public static final class tab25 extends GeckoServiceChildProcess {}
|
||||
public static final class tab26 extends GeckoServiceChildProcess {}
|
||||
public static final class tab27 extends GeckoServiceChildProcess {}
|
||||
public static final class tab28 extends GeckoServiceChildProcess {}
|
||||
public static final class tab29 extends GeckoServiceChildProcess {}
|
||||
public static final class tab30 extends GeckoServiceChildProcess {}
|
||||
public static final class tab31 extends GeckoServiceChildProcess {}
|
||||
public static final class tab32 extends GeckoServiceChildProcess {}
|
||||
public static final class tab33 extends GeckoServiceChildProcess {}
|
||||
public static final class tab34 extends GeckoServiceChildProcess {}
|
||||
public static final class tab35 extends GeckoServiceChildProcess {}
|
||||
public static final class tab36 extends GeckoServiceChildProcess {}
|
||||
public static final class tab37 extends GeckoServiceChildProcess {}
|
||||
public static final class tab38 extends GeckoServiceChildProcess {}
|
||||
public static final class tab39 extends GeckoServiceChildProcess {}
|
||||
public static final class tab40 extends GeckoServiceChildProcess {}
|
||||
public static final class tab41 extends GeckoServiceChildProcess {}
|
||||
public static final class tab42 extends GeckoServiceChildProcess {}
|
||||
public static final class tab43 extends GeckoServiceChildProcess {}
|
||||
public static final class tab44 extends GeckoServiceChildProcess {}
|
||||
public static final class tab45 extends GeckoServiceChildProcess {}
|
||||
public static final class tab46 extends GeckoServiceChildProcess {}
|
||||
public static final class tab47 extends GeckoServiceChildProcess {}
|
||||
public static final class tab48 extends GeckoServiceChildProcess {}
|
||||
public static final class tab49 extends GeckoServiceChildProcess {}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; 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.process;
|
||||
|
||||
public class GeckoChildProcessServices {
|
||||
public static final class gmplugin extends GeckoServiceChildProcess {}
|
||||
public static final class socket extends GeckoServiceChildProcess {}
|
||||
|
||||
{% for id in range(0, MOZ_ANDROID_CONTENT_SERVICE_COUNT | int) %}
|
||||
public static final class tab{{ id }} extends GeckoServiceChildProcess {}
|
||||
{% endfor %}
|
||||
}
|
||||
|
|
@ -16,35 +16,6 @@ project_flag(
|
|||
default=True,
|
||||
)
|
||||
|
||||
option(
|
||||
"--num-content-services",
|
||||
default="40",
|
||||
help="The number of content process services to generate in the GeckoView manifest",
|
||||
)
|
||||
|
||||
|
||||
@depends("--num-content-services")
|
||||
def num_content_services(value):
|
||||
strValue = value[0]
|
||||
intValue = int(strValue)
|
||||
acceptableRange = range(1, 41)
|
||||
if intValue not in acceptableRange:
|
||||
die(
|
||||
"Unacceptable value, must be within range [%d,%d)"
|
||||
% (acceptableRange.start, acceptableRange.stop)
|
||||
)
|
||||
return strValue
|
||||
|
||||
|
||||
set_config("MOZ_ANDROID_CONTENT_SERVICE_COUNT", num_content_services)
|
||||
set_define("MOZ_ANDROID_CONTENT_SERVICE_COUNT", num_content_services)
|
||||
|
||||
project_flag(
|
||||
"MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS",
|
||||
help="Whether to generate content process services with isolatedProcess=true",
|
||||
default=False,
|
||||
)
|
||||
|
||||
option(
|
||||
env="FENNEC_NIGHTLY",
|
||||
help="Enable experimental code for Fennec Nightly users. NOTE: This is *not* equivalent "
|
||||
|
|
|
|||
|
|
@ -383,7 +383,6 @@ class RecursiveMakeBackend(MakeBackend):
|
|||
self._pre_compile = set()
|
||||
|
||||
self._no_skip = {
|
||||
"pre-export": set(),
|
||||
"export": set(),
|
||||
"libs": set(),
|
||||
"misc": set(),
|
||||
|
|
@ -551,9 +550,7 @@ class RecursiveMakeBackend(MakeBackend):
|
|||
self._process_defines(obj, backend_file)
|
||||
|
||||
elif isinstance(obj, GeneratedFile):
|
||||
if obj.required_before_export:
|
||||
tier = "pre-export"
|
||||
elif obj.required_before_compile:
|
||||
if obj.required_before_compile:
|
||||
tier = "export"
|
||||
elif obj.required_during_compile:
|
||||
tier = "pre-compile"
|
||||
|
|
|
|||
|
|
@ -1341,7 +1341,6 @@ class GeneratedFile(ContextDerived):
|
|||
"outputs",
|
||||
"inputs",
|
||||
"flags",
|
||||
"required_before_export",
|
||||
"required_before_compile",
|
||||
"required_during_compile",
|
||||
"localized",
|
||||
|
|
@ -1372,14 +1371,6 @@ class GeneratedFile(ContextDerived):
|
|||
self.force = force
|
||||
self.py2 = py2
|
||||
|
||||
if self.config.substs.get("MOZ_WIDGET_TOOLKIT") == "android":
|
||||
# In GeckoView builds we process Jinja files during pre-export
|
||||
self.required_before_export = [
|
||||
f for f in self.inputs if f.endswith(".jinja")
|
||||
]
|
||||
else:
|
||||
self.required_before_export = False
|
||||
|
||||
suffixes = [
|
||||
".h",
|
||||
".py",
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ license:
|
|||
- js/src/devtools/rootAnalysis/t/
|
||||
- mobile/android/components/extensions
|
||||
- mobile/android/geckoview/src/main/AndroidManifest.xml
|
||||
- mobile/android/geckoview/src/main/AndroidManifest_overlay.jinja
|
||||
- mobile/android/geckoview/src/main/res/drawable/ic_generic_file.xml
|
||||
- mobile/android/geckoview_example/src/main
|
||||
# might not work with license
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче