commit 4d3414774f361d8ed9e85dae2c122577ae1278b4
author Jingwen Chen <jingwen@google.com> Thu Oct 12 04:14:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 04:14:18 2023 +0000
tree fea1308ded0ede57f77fb10d1e2de54587f9d892
parent d378ab27c30a44c66e045df7e824cd39b9cf8856
parent 9543bb19ede322784dcd602def4250754368f228

Merge "Move platform constraints to bazel_common_rules." into main am: 8da97eb01f am: f9c5752edc am: 7e78f71722 am: 9543bb19ed

Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2782309

Change-Id: I2bccdbb1acd8fd18e3ae3f9f96bb68f7bdb3d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 10f2a5d..c3f9f69 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -70,7 +70,7 @@
         ":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_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": [],
     }),
 )