Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 21:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use simpler way to build gst lib name

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-09-21 17:53:20 +02:00
parent 2854847c13
commit a4789defc4
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
python/servo/build_commands.py
View file

@ -13,7 +13,6 @@ import datetime
import os import os
import os.path as path import os.path as path
import platform import platform
import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
@ -403,18 +402,7 @@ class MachCommands(CommandBase):
env["PKG_CONFIG_ALLOW_CROSS"] = '1' env["PKG_CONFIG_ALLOW_CROSS"] = '1'
# Build the name of the package containing all GStreamer dependencies # Build the name of the package containing all GStreamer dependencies
# according to the build target. # according to the build target.
gst_lib = None gst_lib = "gst-build-{}".format(self.config["android"]["lib"])
if re.match("arm-([a-z])*-androideabi", target):
gst_lib = "gst-build-armeabi"
elif re.match("armv7-([a-z])*-androideabi", target):
gst_lib = "gst-build-armeabi-v7a"
elif re.match("x86_64-([a-z])*-android", target):
gst_lib = "gst-build-x86_64"
elif re.match("i686-([a-z])*-android", target):
gst_lib = "gst-build-x86"
else:
raise Exception("Invalid target architecture '%s'" % target)
gst_lib_zip = "%s.zip" % gst_lib gst_lib_zip = "%s.zip" % gst_lib
gst_dir = os.path.join(base_path, "gstreamer") gst_dir = os.path.join(base_path, "gstreamer")
gst_lib_path = os.path.join(base_path, gst_dir, gst_lib) gst_lib_path = os.path.join(base_path, gst_dir, gst_lib)