change paths; updates readme

Author: sweetdream779

FaceTracker/app/jni/CMakeLists.txt

@@ -18,7 +18,6 @@ cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-get_filename_component(TF_SRC_ROOT /home/irina/tensorflow  ABSOLUTE)
 get_filename_component(SAMPLE_SRC_DIR  ${CMAKE_SOURCE_DIR}/  ABSOLUTE)
 
 if (ANDROID_ABI MATCHES "^armeabi-v7a$")
@@ -46,7 +45,6 @@ find_library( # Sets the name of the path variable.
 add_library(tensorflow_detector SHARED
             ${tensorflow_detector_sources})
 target_include_directories(tensorflow_detector PRIVATE
-                           ${TF_SRC_ROOT}
                            ${CMAKE_SOURCE_DIR})
 
 target_link_libraries(tensorflow_detector
@@ -55,4 +53,4 @@ target_link_libraries(tensorflow_detector
                       jnigraphics
                       m
                       atomic
-                      z)
+                      z)

FaceTracker/app/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 "rgb2yuv.h"
+#include "yuv2rgb.h"
 
 #define IMAGEUTILS_METHOD(METHOD_NAME) \
   Java_tensorflow_detector_spc_env_ImageUtils_##METHOD_NAME  // NOLINT

FaceTracker/app/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 "geom.h"
 
 namespace tf_tracking {
 

FaceTracker/app/jni/object_tracking/flow_cache.h

@@ -16,11 +16,11 @@ 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 "geom.h"
+#include "utils.h"
 
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/optical_flow.h"
+#include "config.h"
+#include "optical_flow.h"
 
 namespace tf_tracking {
 

FaceTracker/app/jni/object_tracking/frame_pair.cc

@@ -15,8 +15,8 @@ limitations under the License.
 
 #include <float.h>
 
-#include "tensorflow/examples/android/jni/object_tracking/config.h"
-#include "tensorflow/examples/android/jni/object_tracking/frame_pair.h"
+#include "config.h"
+#include "frame_pair.h"
 
 namespace tf_tracking {
 

FaceTracker/app/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 "keypoint.h"
 
 namespace tf_tracking {
 

FaceTracker/app/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 "logging.h"
+#include "utils.h"
 
 namespace tf_tracking {
 

FaceTracker/app/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 "geom.h"
 
 namespace tf_tracking {
 

FaceTracker/app/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 "geom.h"
+#include "image.h"
+#include "utils.h"
 
 namespace tf_tracking {
 

FaceTracker/app/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 "geom.h"
+#include "utils.h"
 
 // TODO(andrewharp): Make this a cast to uint32_t if/when we go unsigned for
 // operations.