Fix build

This commit is contained in:
Ali 2021-01-15 13:53:28 +04:00
parent c019791982
commit be0de458a4
3 changed files with 12 additions and 3 deletions

View File

@ -20,7 +20,7 @@ Verify that it's working
``` ```
chmod +x bazel chmod +x bazel
bazel --version ./bazel --version
``` ```
4. Adjust configuration parameters 4. Adjust configuration parameters

View File

@ -1,5 +1,5 @@
load( load(
"//build-input/data:variables.bzl", "@build_configuration//:variables.bzl",
"telegram_api_id", "telegram_api_id",
"telegram_api_hash", "telegram_api_hash",
"telegram_app_center_id", "telegram_app_center_id",

View File

@ -51,6 +51,12 @@ genrule(
rm -rf "$$BUILD_DIR" rm -rf "$$BUILD_DIR"
mkdir -p "$$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/" cp $(location :build-libvpx-bazel.sh) "$$BUILD_DIR/"
SOURCE_PATH="third-party/libvpx/libvpx" SOURCE_PATH="third-party/libvpx/libvpx"
@ -59,7 +65,7 @@ genrule(
mkdir -p "$$BUILD_DIR/Public/libvpx" 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([ "\n".join([
"cp -f \"$$BUILD_DIR/VPX.framework/Headers/vpx/{}\" \"$(location Public/vpx/{})\"".format(header, header) for header in headers "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] + outs = ["Public/vpx/" + x for x in headers] +
["Public/vpx/vpx_config.h"] + ["Public/vpx/vpx_config.h"] +
["Public/vpx/lib{}.a".format(x) for x in libs], ["Public/vpx/lib{}.a".format(x) for x in libs],
tools = [
"//third-party/yasm:yasm.tar",
],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",
] ]