From 76c9bce47f39b6a2e4b37dbef40d943fdf0c20bf Mon Sep 17 00:00:00 2001
From: Ray Milkey <ray@opennetworking.org>
Date: Wed, 2 Jan 2019 10:50:45 -0800
Subject: [PATCH] build file updates to support bazel 0.21

Change-Id: I79d3900fc8c14dbecff249cec139754115186352
---
 .bazelrc                                  | 1 +
 tools/build/bazel/generate_test_rules.bzl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bazelrc b/.bazelrc
index 3bd81666ed..44e0932d2a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,5 +1,6 @@
 build --nouse_ijars
 build --experimental_strict_action_env
+build --incompatible_package_name_is_a_function=false
 test --test_summary=terse
 test --test_output=errors
 test --test_verbose_timeout_warnings
diff --git a/tools/build/bazel/generate_test_rules.bzl b/tools/build/bazel/generate_test_rules.bzl
index 03f50739f3..17f811e33f 100644
--- a/tools/build/bazel/generate_test_rules.bzl
+++ b/tools/build/bazel/generate_test_rules.bzl
@@ -61,7 +61,7 @@ def generate_test_rules(
         if (test in flaky_tests) or ("flaky" in tags):
             flaky = 1
         java_class = _package_from_path(
-            PACKAGE_NAME + "/" + _strip_right(test, ".java"),
+            native.package_name() + "/" + _strip_right(test, ".java"),
         )
         package = java_class[:java_class.rfind(".")]
         native.java_test(