diff --git a/.bazelrc b/.bazelrc index 329926a..273e9e0 100644 --- a/.bazelrc +++ b/.bazelrc @@ -89,3 +89,7 @@ common --define=enable_web=true build --android_crosstool_top="@snap_client_toolchains//:android_crosstool" # Web build configuration (used by scripts/bazel_web_serve.sh) build:web --build_tag_filters=web +build:ios --repo_env=VALDI_PLATFORM_DEPENDENCIES=ios +build:android --repo_env=VALDI_PLATFORM_DEPENDENCIES=android +build:macos --repo_env=VALDI_PLATFORM_DEPENDENCIES=macos +build:web --repo_env=VALDI_PLATFORM_DEPENDENCIES=cli diff --git a/WORKSPACE b/WORKSPACE index b300988..db08568 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -57,9 +57,13 @@ maybe( name = "host_platform", ) -load("@valdi//bzl:workspace_init.bzl", "valdi_initialize_workspace") +load("@valdi//bzl:workspace_init.bzl", "platform_dependency_rule", "valdi_initialize_workspace") -valdi_initialize_workspace() +platform_dependency_rule(name = "platform_check") + +load("@platform_check//:target_platform.bzl", "VALDI_PLATFORM_DEPENDENCIES") + +valdi_initialize_workspace(VALDI_PLATFORM_DEPENDENCIES) load("@valdi_npm//:repositories.bzl", "npm_repositories") @@ -67,4 +71,4 @@ npm_repositories() load("@valdi//bzl:workspace_postinit.bzl", "valdi_post_initialize_workspace") -valdi_post_initialize_workspace() \ No newline at end of file +valdi_post_initialize_workspace() diff --git a/scripts/bazel_android_install.sh b/scripts/bazel_android_install.sh index 6ee7806..474164c 100755 --- a/scripts/bazel_android_install.sh +++ b/scripts/bazel_android_install.sh @@ -9,7 +9,7 @@ ROOT_DIR="$SCRIPT_DIR/../" START_ACTIVITY="com.snap.valdi.playground/.StartActivity" pushd "$ROOT_DIR" -bazel build "//valdi_modules/playground:app_android" +bazel build --config=android "//valdi_modules/playground:app_android" adb install -r "bazel-bin/valdi_modules/playground/app_android.apk" adb shell am start -n $START_ACTIVITY diff --git a/scripts/bazel_ios_install.sh b/scripts/bazel_ios_install.sh index db493c4..374153b 100755 --- a/scripts/bazel_ios_install.sh +++ b/scripts/bazel_ios_install.sh @@ -12,7 +12,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" ROOT_DIR="$SCRIPT_DIR/../" pushd "$ROOT_DIR" -bazel build //valdi_modules/playground:app_ios +bazel build --config=ios //valdi_modules/playground:app_ios TARGET_TEMP_DIR=`mktemp` rm "$TARGET_TEMP_DIR" mkdir "$TARGET_TEMP_DIR" diff --git a/scripts/bazel_macos_run.sh b/scripts/bazel_macos_run.sh index d6abbf9..ef6f442 100755 --- a/scripts/bazel_macos_run.sh +++ b/scripts/bazel_macos_run.sh @@ -12,6 +12,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" ROOT_DIR="$SCRIPT_DIR/../" pushd "$ROOT_DIR" -bazel build "//valdi_modules/playground:app_macos" +bazel build --config=macos "//valdi_modules/playground:app_macos" ./bazel-bin/valdi_modules/playground/app_macos_bin popd diff --git a/scripts/bazel_web_serve.sh b/scripts/bazel_web_serve.sh index c0d5c55..7748339 100755 --- a/scripts/bazel_web_serve.sh +++ b/scripts/bazel_web_serve.sh @@ -21,7 +21,7 @@ if command -v lsof &>/dev/null && lsof -i ":$PORT" -sTCP:LISTEN -t &>/dev/null; fi echo "Building web bundle..." -bazel build "$WEB_TARGET" +bazel build --config=web "$WEB_TARGET" OUT_DIR="$ROOT_DIR/bazel-bin/valdi_modules/playground/playground_export_npm" if [[ ! -d "$OUT_DIR" ]]; then