aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingwen Chen <jingwen@google.com>2023-10-12 04:46:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-12 04:46:18 +0000
commit1a7c2aed3129770d18c097925fe8e3b3f2f02909 (patch)
tree9cd5f51239e0559f87b91340d67aa8199faf408e
parent859c233dc2f5c14f4c533e2dc2c3126c3c5dc634 (diff)
parent4d3414774f361d8ed9e85dae2c122577ae1278b4 (diff)
downloadprotobuf-1a7c2aed3129770d18c097925fe8e3b3f2f02909.tar.gz
Merge "Move platform constraints to bazel_common_rules." into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed am: 4d3414774f
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: I5761fc10ca7cdae283ce9a0bfdbb0dde7f83b561 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--BUILD.bazel4
1 files changed, 2 insertions, 2 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index 10f2a5d7c..c3f9f69ab 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -70,7 +70,7 @@ java_library(
":libprotobuf-java-full_proto_gen",
],
target_compatible_with = select({
- "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
+ "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
)
@@ -81,7 +81,7 @@ java_library(
java_version = "1.7",
neverlink = True,
target_compatible_with = select({
- "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
+ "//build/bazel_common_rules/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
)