Update get_free_ffmpeg_source_files.py from Chromium dist-git
There are no longer 'ffmpeg_branding == "Chromium"' conditionals, we need to key on the absence of 'ffmpeg_branding == "Chrome"' or 'ffmpeg_branding == "ChromeOS"' conditionals instead.
This commit is contained in:
parent
c8151228d0
commit
be68fdf87b
@ -55,14 +55,19 @@ def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm):
|
|||||||
blocks = re.findall(r"(\(.*?\))\s\{(.*?)\}", section, re.DOTALL)
|
blocks = re.findall(r"(\(.*?\))\s\{(.*?)\}", section, re.DOTALL)
|
||||||
for block in blocks:
|
for block in blocks:
|
||||||
conditions = re.findall(r"\(?\((.*?)\)", block[0])
|
conditions = re.findall(r"\(?\((.*?)\)", block[0])
|
||||||
|
inserted = False
|
||||||
for condition in conditions:
|
for condition in conditions:
|
||||||
limitations = ['is_linux', 'ffmpeg_branding == "Chromium"']
|
if inserted:
|
||||||
if all(limitation in condition for limitation in limitations):
|
break
|
||||||
|
limitations = ['ffmpeg_branding == "Chrome"', 'ffmpeg_branding == "ChromeOS"']
|
||||||
|
if ('is_linux' in condition) and not any(limitation in condition for limitation in limitations):
|
||||||
if (arch_not_arm):
|
if (arch_not_arm):
|
||||||
if ('x64' in condition) or ('x86' in condition):
|
if ('x64' in condition) or ('x86' in condition):
|
||||||
parse_sources (block[1], output_sources, arch_not_arm)
|
parse_sources (block[1], output_sources, arch_not_arm)
|
||||||
|
inserted = True
|
||||||
else:
|
else:
|
||||||
parse_sources (block[1], output_sources, arch_not_arm)
|
parse_sources (block[1], output_sources, arch_not_arm)
|
||||||
|
inserted = True
|
||||||
|
|
||||||
print ' '.join(output_sources)
|
print ' '.join(output_sources)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user