Move deprecated example.

from examples/android to tools/android/test.

All changes are just find/replace the path.

PiperOrigin-RevId: 334371911
Change-Id: If90dc1ddf8d11fdf71a6c9f9c77072cb08736c5a

tensorflow/examples/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Thu Jul 23 05:42:16 CEST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java

@@ -51,7 +51,7 @@ final class NativeLibrary {
       // (1) The native library has already been statically loaded, OR
       // (2) The required native code has been statically linked (through a custom launcher), OR
       // (3) The native code is part of another library (such as an application-level library)
-      // that has already been loaded. For example, tensorflow/examples/android and
+      // that has already been loaded. For example, tensorflow/tools/android/test and
       // tensorflow/tools/android/inference_interface include the required native code in
       // differently named libraries.
       //

tensorflow/tools/android/inference_interface/java/org/tensorflow/contrib/android/TensorFlowInferenceInterface.java

@@ -43,8 +43,8 @@ import org.tensorflow.types.UInt8;
  * Wrapper over the TensorFlow API ({@link Graph}, {@link Session}) providing a smaller API surface
  * for inference.
  *
- * <p>See tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageClassifier.java for an
- * example usage.
+ * <p>See tensorflow/tools/android/test/src/org/tensorflow/demo/TensorFlowImageClassifier.java for
+ * an example usage.
  */
 public class TensorFlowInferenceInterface {
   private static final String TAG = "TensorFlowInferenceInterface";

tensorflow/tools/android/test/.gitignore

@@ -0,0 +1,30 @@
+# This file is based on https://github.com/github/gitignore/blob/master/Android.gitignore
+*.iml
+.idea/compiler.xml
+.idea/copyright
+.idea/dictionaries
+.idea/gradle.xml
+.idea/libraries
+.idea/inspectionProfiles
+.idea/misc.xml
+.idea/modules.xml
+.idea/runConfigurations.xml
+.idea/tasks.xml
+.idea/workspace.xml
+.gradle
+local.properties
+.DS_Store
+build/
+gradleBuild/
+*.apk
+*.ap_
+*.dex
+*.class
+bin/
+gen/
+out/
+*.log
+.navigation/
+/captures
+.externalNativeBuild
+.cxx

tensorflow/tools/android/test/BUILD

@@ -69,7 +69,7 @@ android_binary(
     # Package assets from assets dir as well as all model targets. Remove undesired models
     # (and corresponding Activities in source) to reduce APK size.
     assets = [
-        "//tensorflow/examples/android/assets:asset_files",
+        "//tensorflow/tools/android/test/assets:asset_files",
         ":external_assets",
     ],
     assets_dir = "",
@@ -96,7 +96,7 @@ filegroup(
         "@stylize//:model_files",
     ],
 )
-# LINT.ThenChange(//tensorflow/examples/android/download-models.gradle)
+# LINT.ThenChange(//tensorflow/tools/android/test/download-models.gradle)
 
 filegroup(
     name = "java_files",

tensorflow/tools/android/test/README.md

@@ -1,5 +1,7 @@
 # TensorFlow Android Camera Demo
 
+DEPRECATED: These examples are deprecated.
+
 This folder contains an example application utilizing TensorFlow for Android
 devices.
 
@@ -20,22 +22,22 @@ on API >= 14 devices.
 
 ## Current samples:
 
-1. [TF Classify](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java):
+1. [TF Classify](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/android/test/src/org/tensorflow/demo/ClassifierActivity.java):
         Uses the [Google Inception](https://arxiv.org/abs/1409.4842)
         model to classify camera frames in real-time, displaying the top results
         in an overlay on the camera image.
-2. [TF Detect](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java):
+2. [TF Detect](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/android/test/src/org/tensorflow/demo/DetectorActivity.java):
         Demonstrates an SSD-Mobilenet model trained using the
         [Tensorflow Object Detection API](https://github.com/tensorflow/models/tree/master/research/object_detection/)
         introduced in [Speed/accuracy trade-offs for modern convolutional object detectors](https://arxiv.org/abs/1611.10012) to
         localize and track objects (from 80 categories) in the camera preview
         in real-time.
-3. [TF Stylize](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java):
+3. [TF Stylize](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/android/test/src/org/tensorflow/demo/StylizeActivity.java):
         Uses a model based on [A Learned Representation For Artistic
         Style](https://arxiv.org/abs/1610.07629) to restyle the camera preview
         image to that of a number of different artists.
 4.  [TF
-    Speech](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/SpeechActivity.java):
+    Speech](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/android/test/src/org/tensorflow/demo/SpeechActivity.java):
     Runs a simple speech recognition model built by the [audio training
     tutorial](https://www.tensorflow.org/versions/master/tutorials/audio_recognition). Listens
     for a small set of words, and highlights them in the UI when they are
@@ -165,7 +167,7 @@ BASE_URL=https://storage.googleapis.com/download.tensorflow.org/models
 for MODEL_ZIP in inception5h.zip ssd_mobilenet_v1_android_export.zip stylize_v1.zip
 do
   curl -L ${BASE_URL}/${MODEL_ZIP} -o /tmp/${MODEL_ZIP}
-  unzip /tmp/${MODEL_ZIP} -d tensorflow/examples/android/assets/
+  unzip /tmp/${MODEL_ZIP} -d tensorflow/tools/android/test/assets/
 done
 ```
 
@@ -182,7 +184,7 @@ After editing your WORKSPACE file to update the SDK/NDK configuration, you may
 build the APK. Run this from your workspace root:
 
 ```bash
-bazel build --cxxopt='--std=c++11' -c opt //tensorflow/examples/android:tensorflow_demo
+bazel build --cxxopt='--std=c++11' -c opt //tensorflow/tools/android/test:tensorflow_demo
 ```
 
 ##### Install
@@ -192,7 +194,7 @@ device, then after building use the following command from your workspace root
 to install the APK:
 
 ```bash
-adb install -r bazel-bin/tensorflow/examples/android/tensorflow_demo.apk
+adb install -r bazel-bin/tensorflow/tools/android/test/tensorflow_demo.apk
 ```
 
 ### Android Studio with Bazel
@@ -202,7 +204,7 @@ make sure that you can build with Bazel following the above directions. Then,
 look at [build.gradle](build.gradle) and make sure that the path to Bazel
 matches that of your system.
 
-At this point you can add the tensorflow/examples/android directory as a new
+At this point you can add the tensorflow/tools/android/test directory as a new
 Android Studio project. Click through installing all the Gradle extensions it
 requests, and you should be able to have Android Studio build the demo like any
 other application (it will call out to Bazel to build the native code with the

tensorflow/tools/android/test/build.gradle

@@ -56,7 +56,7 @@ def nativeOutDir = 'libs/' + cpuType
 
 // Default to building with Bazel and override with make if requested.
 def nativeBuildRule = 'buildNativeBazel'
-def demoLibPath = '../../../bazel-bin/tensorflow/examples/android/libtensorflow_demo.so'
+def demoLibPath = '../../../bazel-bin/tensorflow/tools/android/test/libtensorflow_demo.so'
 def inferenceLibPath = '../../../bazel-bin/tensorflow/tools/android/inference_interface/libtensorflow_inference.so'
 
 // Override for Makefile builds.
@@ -149,7 +149,7 @@ android {
 task buildNativeBazel(type: Exec) {
     workingDir '../../..'
     commandLine bazelLocation, 'build', '-c', 'opt',  \
-         'tensorflow/examples/android:tensorflow_native_libs',  \
+         'tensorflow/tools/android/test:tensorflow_native_libs',  \
          '--crosstool_top=//external:android/crosstool',  \
          '--cpu=' + cpuType,  \
          '--host_crosstool_top=@bazel_tools//tools/cpp:toolchain'

tensorflow/tools/android/test/download-models.gradle

@@ -13,7 +13,7 @@ def models = ['inception_v1.zip',
               'object_detection/ssd_mobilenet_v1_android_export.zip',
               'stylize_v1.zip',
               'speech_commands_conv_actions.zip']
-// LINT.ThenChange(//tensorflow/examples/android/BUILD)
+// LINT.ThenChange(//tensorflow/tools/android/test/BUILD)
 
 // Root URL for model archives
 def MODEL_URL = 'https://storage.googleapis.com/download.tensorflow.org/models'

tensorflow/tools/android/test/jni/imageutils_jni.cc

@@ -20,8 +20,8 @@ limitations under the License.
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "tensorflow/examples/android/jni/rgb2yuv.h"
-#include "tensorflow/examples/android/jni/yuv2rgb.h"
+#include "tensorflow/tools/android/test/jni/rgb2yuv.h"
+#include "tensorflow/tools/android/test/jni/yuv2rgb.h"
 
 #define IMAGEUTILS_METHOD(METHOD_NAME) \
   Java_org_tensorflow_demo_env_ImageUtils_##METHOD_NAME  // NOLINT

tensorflow/tools/android/test/jni/object_tracking/config.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <math.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/flow_cache.h

@@ -16,11 +16,10 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_FLOW_CACHE_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_FLOW_CACHE_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/frame_pair.cc

@@ -13,10 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include "tensorflow/tools/android/test/jni/object_tracking/frame_pair.h"
+
 #include <float.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/frame_pair.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/frame_pair.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_FRAME_PAIR_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_FRAME_PAIR_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/geom.h

@@ -16,8 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_GEOM_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_GEOM_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/gl_utils.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/image-inl.h

@@ -18,9 +18,9 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/image.h

@@ -18,8 +18,8 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 // TODO(andrewharp): Make this a cast to uint32_t if/when we go unsigned for
 // operations.

tensorflow/tools/android/test/jni/object_tracking/image_data.h

@@ -17,16 +17,16 @@ limitations under the License.
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_IMAGE_DATA_H_
 
 #include <stdint.h>
+
 #include <memory>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_utils.h"
-#include "tensorflow/examples/android/jni/object_tracking/integral_image.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/integral_image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/image_neon.cc

@@ -19,13 +19,12 @@ limitations under the License.
 #ifdef __ARM_NEON
 
 #include <arm_neon.h>
-
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_utils.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/image_utils.h

@@ -18,11 +18,10 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/integral_image.h

@@ -16,10 +16,10 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_INTEGRAL_IMAGE_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_INTEGRAL_IMAGE_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/jni_utils.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <jni.h>
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 // The JniLongField class is used to access Java fields from native code. This
 // technique of hiding pointers to native objects in opaque Java fields is how

tensorflow/tools/android/test/jni/object_tracking/keypoint.h

@@ -16,14 +16,13 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_KEYPOINT_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_KEYPOINT_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.cc

@@ -15,16 +15,16 @@ limitations under the License.
 
 // Various keypoint detecting functions.
 
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.h"
+
 #include <float.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.h

@@ -17,12 +17,13 @@ limitations under the License.
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_KEYPOINT_DETECTOR_H_
 
 #include <stdint.h>
+
 #include <vector>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_data.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_data.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/optical_flow.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/logging.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
 
 #ifdef STANDALONE_DEMO_LIB
 

tensorflow/tools/android/test/jni/object_tracking/object_detector.cc

@@ -17,7 +17,7 @@ limitations under the License.
 // in this directory. This class remains mainly for historical reasons.
 // Detection in the TF demo is done through TensorFlowMultiBoxDetector.java.
 
-#include "tensorflow/examples/android/jni/object_tracking/object_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_detector.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/object_detector.h

@@ -24,24 +24,24 @@ limitations under the License.
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_OBJECT_DETECTOR_H_
 
 #include <float.h>
+
 #include <map>
 #include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/integral_image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/integral_image.h"
 #ifdef __RENDER_OPENGL__
-#include "tensorflow/examples/android/jni/object_tracking/sprite.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/sprite.h"
 #endif
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_data.h"
-#include "tensorflow/examples/android/jni/object_tracking/object_model.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_data.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_model.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/object_model.h

@@ -29,18 +29,17 @@ limitations under the License.
 
 #include <vector>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/integral_image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/integral_image.h"
 #ifdef __RENDER_OPENGL__
-#include "tensorflow/examples/android/jni/object_tracking/sprite.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/sprite.h"
 #endif
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_data.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_data.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/object_tracker.cc

@@ -22,19 +22,19 @@ limitations under the License.
 #include <map>
 #include <string>
 
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/flow_cache.h"
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/integral_image.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint_detector.h"
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
-#include "tensorflow/examples/android/jni/object_tracking/object_detector.h"
-#include "tensorflow/examples/android/jni/object_tracking/object_tracker.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/flow_cache.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/integral_image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_tracker.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/object_tracker.h

@@ -19,18 +19,17 @@ limitations under the License.
 #include <map>
 #include <string>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/integral_image.h"
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/flow_cache.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint_detector.h"
-#include "tensorflow/examples/android/jni/object_tracking/object_model.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
-#include "tensorflow/examples/android/jni/object_tracking/tracked_object.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/flow_cache.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/integral_image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_model.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/tracked_object.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/object_tracker_jni.cc

@@ -18,15 +18,15 @@ limitations under the License.
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <cstdint>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/jni_utils.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/object_tracker.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/jni_utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_tracker.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/optical_flow.cc

@@ -13,21 +13,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include "tensorflow/tools/android/test/jni/object_tracking/optical_flow.h"
+
 #include <math.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/flow_cache.h"
-#include "tensorflow/examples/android/jni/object_tracking/frame_pair.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_data.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint_detector.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/flow_cache.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/frame_pair.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_data.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/optical_flow.h

@@ -16,15 +16,14 @@ limitations under the License.
 #ifndef TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_OPTICAL_FLOW_H_
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_OPTICAL_FLOW_H_
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
-
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/frame_pair.h"
-#include "tensorflow/examples/android/jni/object_tracking/image_data.h"
-#include "tensorflow/examples/android/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/config.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/frame_pair.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image_data.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/keypoint.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/sprite.h

@@ -21,8 +21,8 @@ limitations under the License.
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/time_log.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/examples/android/jni/object_tracking/time_log.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/time_log.h"
 
 #ifdef LOG_TIME
 // Storage for logging functionality.

tensorflow/tools/android/test/jni/object_tracking/time_log.h

@@ -20,8 +20,8 @@ limitations under the License.
 
 #include <stdint.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 #ifdef LOG_TIME
 

tensorflow/tools/android/test/jni/object_tracking/tracked_object.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/examples/android/jni/object_tracking/tracked_object.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/tracked_object.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/tracked_object.h

@@ -17,9 +17,9 @@ limitations under the License.
 #define TENSORFLOW_EXAMPLES_ANDROID_JNI_OBJECT_TRACKING_TRACKED_OBJECT_H_
 
 #ifdef __RENDER_OPENGL__
-#include "tensorflow/examples/android/jni/object_tracking/gl_utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/gl_utils.h"
 #endif
-#include "tensorflow/examples/android/jni/object_tracking/object_detector.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/object_detector.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/object_tracking/utils.h

@@ -28,7 +28,7 @@ limitations under the License.
 #include <sys/time.h>
 #endif  // ifdef HAVE_CLOCK_GETTIME
 
-#include "tensorflow/examples/android/jni/object_tracking/logging.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/logging.h"
 
 // TODO(andrewharp): clean up these macros to use the codebase statndard.
 

tensorflow/tools/android/test/jni/object_tracking/utils_neon.cc

@@ -20,10 +20,10 @@ limitations under the License.
 
 #include <arm_neon.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/geom.h"
-#include "tensorflow/examples/android/jni/object_tracking/image-inl.h"
-#include "tensorflow/examples/android/jni/object_tracking/image.h"
-#include "tensorflow/examples/android/jni/object_tracking/utils.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/geom.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image-inl.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/image.h"
+#include "tensorflow/tools/android/test/jni/object_tracking/utils.h"
 
 namespace tf_tracking {
 

tensorflow/tools/android/test/jni/rgb2yuv.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 // These utility functions allow for the conversion of RGB data to YUV data.
 
-#include "tensorflow/examples/android/jni/rgb2yuv.h"
+#include "tensorflow/tools/android/test/jni/rgb2yuv.h"
 
 static inline void WriteYUV(const int x, const int y, const int width,
                             const int r8, const int g8, const int b8,

tensorflow/tools/android/test/jni/yuv2rgb.cc

@@ -16,7 +16,7 @@ limitations under the License.
 // This is a collection of routines which converts various YUV image formats
 // to ARGB.
 
-#include "tensorflow/examples/android/jni/yuv2rgb.h"
+#include "tensorflow/tools/android/test/jni/yuv2rgb.h"
 
 #ifndef MAX
 #define MAX(a, b) ({__typeof__(a) _a = (a); __typeof__(b) _b = (b); _a > _b ? _a : _b; })