diff options
author | Zichuan Wei <zichuanwei@google.com> | 2022-10-19 23:31:04 -0700 |
---|---|---|
committer | TensorFlow Release Automation <jenkins@tensorflow.org> | 2022-11-27 14:59:00 +0000 |
commit | bbd0a2d30c2f742f059d736f0d155171f1bbd1ae (patch) | |
tree | 72f09a954b319d0d8a5e08fab9fc2b453a29af42 | |
parent | d5b57ca93e506df258271ea00fc29cf98383a374 (diff) | |
download | tensorflow-upstream-r2.11-d8110a18d60.tar.gz |
lite: update androidx annotation location for opensourceupstream-r2.11-d8110a18d60
PiperOrigin-RevId: 482398723
-rw-r--r-- | tensorflow/lite/java/BUILD | 4 | ||||
-rw-r--r-- | tensorflow/workspace2.bzl | 16 | ||||
-rw-r--r-- | tensorflow/workspace3.bzl | 9 |
3 files changed, 27 insertions, 2 deletions
diff --git a/tensorflow/lite/java/BUILD b/tensorflow/lite/java/BUILD index 08f4c12be52..15e5ab01b03 100644 --- a/tensorflow/lite/java/BUILD +++ b/tensorflow/lite/java/BUILD @@ -303,7 +303,7 @@ android_library( deps = [ ":tensorflowlite_gpu_api", "//tensorflow/lite/java:tensorflowlite_api", - "//third_party/java/androidx/annotation", + "@maven//:androidx_annotation_annotation", ], ) @@ -315,7 +315,7 @@ android_library( deps = [ ":tensorflowlite_api", ":tensorflowlite_gpu_api", - "//third_party/java/androidx/annotation", + "@maven//:androidx_annotation_annotation", ], ) diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl index 18b63ab47fb..18274158395 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -50,6 +50,7 @@ load("@tf_runtime//:dependencies.bzl", "tfrt_dependencies") load("//tensorflow/tools/toolchains/remote_config:configs.bzl", "initialize_rbe_configs") load("//tensorflow/tools/toolchains/remote:configure.bzl", "remote_execution_configure") load("//tensorflow/tools/toolchains/clang6:repo.bzl", "clang6_configure") +load("@rules_jvm_external//:defs.bzl", "maven_install") def _initialize_third_party(): """ Load third party repositories. See above load() statements. """ @@ -919,6 +920,21 @@ def _tf_repositories(): ], ) + # used for adding androidx.annotation dependencies in tflite android jni. + maven_install( + artifacts = [ + "androidx.annotation:annotation:aar:1.1.0", + ], + repositories = [ + "https://jcenter.bintray.com", + "https://maven.google.com", + "https://dl.google.com/dl/android/maven2", + "https://repo1.maven.org/maven2", + ], + fetch_sources = True, + version_conflict_policy = "pinned", + ) + def workspace(): # Check the bazel version before executing any repository rules, in case # those rules rely on the version we require here. diff --git a/tensorflow/workspace3.bzl b/tensorflow/workspace3.bzl index a6c2c5c5835..1d02b6fe0dc 100644 --- a/tensorflow/workspace3.bzl +++ b/tensorflow/workspace3.bzl @@ -36,6 +36,15 @@ def workspace(): sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2", ) + # Maven dependencies. + RULES_JVM_EXTERNAL_TAG = "3.2" + http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + sha256 = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af", + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, + ) + # Load the raw llvm-project. llvm does not have build rules set up by default, # but provides a script for setting up build rules via overlays. llvm("llvm-raw") |