From be0de458a41d6928c9a7b373f6e3abc19b490699 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 15 Jan 2021 13:53:28 +0400 Subject: [PATCH] Fix build --- README.md | 2 +- submodules/BuildConfig/BUILD | 2 +- third-party/libvpx/BUILD | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 969ef0977d..77bf34ba74 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Verify that it's working ``` chmod +x bazel -bazel --version +./bazel --version ``` 4. Adjust configuration parameters diff --git a/submodules/BuildConfig/BUILD b/submodules/BuildConfig/BUILD index 43c0ca2b29..d3f9c56360 100644 --- a/submodules/BuildConfig/BUILD +++ b/submodules/BuildConfig/BUILD @@ -1,5 +1,5 @@ load( - "//build-input/data:variables.bzl", + "@build_configuration//:variables.bzl", "telegram_api_id", "telegram_api_hash", "telegram_app_center_id", diff --git a/third-party/libvpx/BUILD b/third-party/libvpx/BUILD index 62533a718d..26ed453745 100644 --- a/third-party/libvpx/BUILD +++ b/third-party/libvpx/BUILD @@ -51,6 +51,12 @@ genrule( rm -rf "$$BUILD_DIR" mkdir -p "$$BUILD_DIR" + YASM_DIR="$$BUILD_DIR/yasm" + rm -rf "$$YASM_DIR" + mkdir -p "$$YASM_DIR" + tar -xf "$(location //third-party/yasm:yasm.tar)" -C "$$YASM_DIR" + ABS_YASM_DIR="$$(pwd)/$$(dirname $$YASM_DIR)/$$(basename $$YASM_DIR)" + cp $(location :build-libvpx-bazel.sh) "$$BUILD_DIR/" SOURCE_PATH="third-party/libvpx/libvpx" @@ -59,7 +65,7 @@ genrule( mkdir -p "$$BUILD_DIR/Public/libvpx" - arch -x86_64 sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR" + PATH="$$PATH:$$ABS_YASM_DIR" arch -x86_64 sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR" """ + "\n".join([ "cp -f \"$$BUILD_DIR/VPX.framework/Headers/vpx/{}\" \"$(location Public/vpx/{})\"".format(header, header) for header in headers @@ -72,6 +78,9 @@ genrule( outs = ["Public/vpx/" + x for x in headers] + ["Public/vpx/vpx_config.h"] + ["Public/vpx/lib{}.a".format(x) for x in libs], + tools = [ + "//third-party/yasm:yasm.tar", + ], visibility = [ "//visibility:public", ]