Use bazel_dep instead of vendored Google Test with Bazel (#3801)

This commit is contained in:
Bart Louwers
2025-09-17 13:36:45 +00:00
committed by GitHub
parent 49741f5bd0
commit 5af61373b5
5 changed files with 10 additions and 22 deletions

View File

@@ -9,3 +9,9 @@ bazel-testlogs
.cxx .cxx
build-* build-*
build build
# Ignore vendored Bazel workspaces that conflict with this repo
vendor/benchmark
vendor/googletest
vendor/maplibre-native-base/extras/rapidjson/thirdparty
vendor/eternal/vendor

View File

@@ -11,6 +11,7 @@ bazel_dep(name = "libuv", version = "1.48.0")
bazel_dep(name = "apple_support", version = "1.23.1", repo_name = "build_bazel_apple_support") bazel_dep(name = "apple_support", version = "1.23.1", repo_name = "build_bazel_apple_support")
bazel_dep(name = "rules_cc", version = "0.2.8") bazel_dep(name = "rules_cc", version = "0.2.8")
bazel_dep(name = "rules_shell", version = "0.6.1") bazel_dep(name = "rules_shell", version = "0.6.1")
bazel_dep(name = "googletest", version = "1.17.0")
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True) node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
node.toolchain(node_version = "20.14.0") node.toolchain(node_version = "20.14.0")

View File

@@ -219,26 +219,6 @@ ios_application(
], ],
) )
ios_application(
name = "AppDynamicLib",
bundle_id = "org.maplibre.app",
families = [
"iphone",
"ipad",
],
frameworks = [
"MapLibre.link",
],
infoplists = ["app/Info.plist"],
minimum_os_version = "12.0",
provisioning_profile = ":xcode_profile",
resources = _IOS_APPLICATION_RESOURCES,
visibility = ["//visibility:public"],
deps = [
"//platform:iosapp",
],
)
ios_application( ios_application(
name = "BenchmarkApp", name = "BenchmarkApp",
bundle_id = "{}.benchmark.app".format(BUNDLE_ID_PREFIX), bundle_id = "{}.benchmark.app".format(BUNDLE_ID_PREFIX),

View File

@@ -37,6 +37,7 @@ cc_library(
] + select({ ] + select({
"@platforms//os:ios": ["//platform:ios-sdk"], "@platforms//os:ios": ["//platform:ios-sdk"],
"@platforms//os:linux": ["//platform/linux:impl"], "@platforms//os:linux": ["//platform/linux:impl"],
"//conditions:default": [],
}), }),
) )

View File

@@ -6,7 +6,7 @@ cc_library(
hdrs = glob(["include/mbgl/test/*.hpp"]), hdrs = glob(["include/mbgl/test/*.hpp"]),
strip_include_prefix = "include", strip_include_prefix = "include",
deps = [ deps = [
"//vendor/googletest:gtest", "@googletest//:gtest",
], ],
) )
@@ -60,7 +60,7 @@ cc_library(
"testutils", "testutils",
"//:mbgl-core", "//:mbgl-core",
"//platform/default:mbgl-default", "//platform/default:mbgl-default",
"//vendor/googletest:gtest_main", "@googletest//:gtest_main",
], ],
alwayslink = True, alwayslink = True,
) )