aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingwen Chen <jingwen@google.com>2023-10-12 03:40:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-12 03:40:54 +0000
commit9543bb19ede322784dcd602def4250754368f228 (patch)
treefea1308ded0ede57f77fb10d1e2de54587f9d892
parentdb79457a3e8edf0e2351636b98a538d9142bcb0a (diff)
parent7e78f717223e9adf23c01ae7edb90ce5c2f0d282 (diff)
downloadprotobuf-9543bb19ede322784dcd602def4250754368f228.tar.gz
Merge "Move platform constraints to bazel_common_rules." into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309 Change-Id: Ie3ca959c128757174b9a3995e50b4e58758f32cb 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": [],
}),
)