From f92692223dd19772ee2dec10707043807c19fa16 Mon Sep 17 00:00:00 2001
From: Austin Anderson <angerson@google.com>
Date: Mon, 13 Nov 2017 18:02:43 -0800
Subject: [PATCH] Explicitly specify TFLite demo assets in BUILD file

PiperOrigin-RevId: 175617982
---
 tensorflow/contrib/lite/java/demo/app/src/main/BUILD   | 10 ++--------
 .../contrib/lite/java/demo/app/src/main/assets/BUILD   |  6 ++----
 third_party/tflite_mobilenet.BUILD                     |  5 ++---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/BUILD b/tensorflow/contrib/lite/java/demo/app/src/main/BUILD
index 4fc6d99d8c2..654fa9d6d27 100644
--- a/tensorflow/contrib/lite/java/demo/app/src/main/BUILD
+++ b/tensorflow/contrib/lite/java/demo/app/src/main/BUILD
@@ -6,7 +6,8 @@ android_binary(
     name = "TfLiteCameraDemo",
     srcs = glob(["java/**/*.java"]),
     assets = [
-        ":assets",
+        "@tflite_mobilenet//:labels.txt",
+        "@tflite_mobilenet//:mobilenet_quant_v1_224.tflite",
     ],
     assets_dir = "",
     custom_package = "com.example.android.tflitecamerademo",
@@ -27,13 +28,6 @@ android_binary(
     ],
 )
 
-filegroup(
-    name = "assets",
-    srcs = [
-        "@tflite_mobilenet//:model_files",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD b/tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD
index 1a759f5652a..dd0cd6c98ff 100644
--- a/tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD
+++ b/tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD
@@ -2,15 +2,13 @@ package(default_visibility = ["//visibility:private"])
 
 licenses(["notice"])  # Apache 2.0
 
-filegroup(
-    name = "assets_files",
-    srcs = glob(
+exports_files(
+    glob(
         ["**/*"],
         exclude = [
             "BUILD",
         ],
     ),
-    visibility = ["//visibility:public"],
 )
 
 filegroup(
diff --git a/third_party/tflite_mobilenet.BUILD b/third_party/tflite_mobilenet.BUILD
index 75663eff485..de47ed61f9d 100644
--- a/third_party/tflite_mobilenet.BUILD
+++ b/third_party/tflite_mobilenet.BUILD
@@ -2,9 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
-filegroup(
-    name = "model_files",
-    srcs = glob(
+exports_files(
+    glob(
         ["**/*"],
         exclude = [
             "BUILD",