diff options
author | Shashi Shekhar <shashishekhar@google.com> | 2018-06-20 11:57:48 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-06-20 12:03:48 -0700 |
commit | 5d773dd3046172cb6e296840a0c8ed5eb6c1fa6f (patch) | |
tree | af4500d9575b130feb4e2f47007eb407f117c60e /tensorflow/contrib/lite/examples/android | |
parent | 5988a74d16571686ae272d6ee3c740db34a2e6c8 (diff) |
Fix gradle build for TFLite Android example.
PiperOrigin-RevId: 201391220
Diffstat (limited to 'tensorflow/contrib/lite/examples/android')
-rw-r--r-- | tensorflow/contrib/lite/examples/android/BUILD | 42 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/android.iml | 19 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/build.gradle | 60 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/download-models.gradle | 73 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/AndroidManifest.xml (renamed from tensorflow/contrib/lite/examples/android/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/assets/BUILD (renamed from tensorflow/contrib/lite/examples/android/assets/BUILD) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/assets/box_priors.txt (renamed from tensorflow/contrib/lite/examples/android/assets/box_priors.txt) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/assets/coco_labels_list.txt (renamed from tensorflow/contrib/lite/examples/android/assets/coco_labels_list.txt) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/assets/conv_actions_labels.txt (renamed from tensorflow/contrib/lite/examples/android/assets/conv_actions_labels.txt) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt (renamed from tensorflow/contrib/lite/examples/android/assets/labels_mobilenet_quant_v1_224.txt) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/AutoFitTextureView.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraActivity.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/Classifier.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ClassifierActivity.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/DetectorActivity.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/LegacyCameraConnectionFragment.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/OverlayView.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognitionScoreView.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognizeCommands.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ResultsView.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/SpeechActivity.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteImageClassifier.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/AssetUtils.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/BorderedText.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/ImageUtils.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Logger.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Size.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/SplitTimer.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java (renamed from tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/animator/color_animation.xml (renamed from tensorflow/contrib/lite/examples/android/res/animator/color_animation.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_action_info.png) | bin | 1025 -> 1025 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_launcher.png) | bin | 4312 -> 4312 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-hdpi/tile.9.png) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_action_info.png) | bin | 665 -> 665 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_launcher.png) | bin | 2265 -> 2265 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_action_info.png) | bin | 1355 -> 1355 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_launcher.png) | bin | 6683 -> 6683 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_action_info.png) | bin | 2265 -> 2265 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png (renamed from tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_launcher.png) | bin | 12746 -> 12746 bytes | |||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/drawable/border.xml (renamed from tensorflow/contrib/lite/examples/android/res/drawable/border.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_camera.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/activity_camera.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_speech.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/activity_speech.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_stylize.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_tracking.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/layout/list_text_item.xml (renamed from tensorflow/contrib/lite/examples/android/res/layout/list_text_item.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-dimens.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-v11/styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/template-styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-v11/template-styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-v14/styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-v14/styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-colors.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-v21/base-colors.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values-v21/base-template-styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/attrs.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/attrs.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/base-strings.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/base-strings.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/colors.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/colors.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/strings.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-dimens.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/template-dimens.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-styles.xml (renamed from tensorflow/contrib/lite/examples/android/res/values/template-styles.xml) | 0 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/build.gradle | 55 | ||||
-rw-r--r-- | tensorflow/contrib/lite/examples/android/settings.gradle | 1 |
65 files changed, 173 insertions, 77 deletions
diff --git a/tensorflow/contrib/lite/examples/android/BUILD b/tensorflow/contrib/lite/examples/android/BUILD index 3e3b4db7d3..dd2cd17324 100644 --- a/tensorflow/contrib/lite/examples/android/BUILD +++ b/tensorflow/contrib/lite/examples/android/BUILD @@ -26,28 +26,28 @@ cc_library( android_binary( name = "tflite_demo", srcs = glob([ - "src/**/*.java", + "app/src/main/java/**/*.java", ]), # 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/contrib/lite/examples/android/assets:labels_mobilenet_quant_v1_224.txt", + "//tensorflow/contrib/lite/examples/android/app/src/main/assets:labels_mobilenet_quant_v1_224.txt", "@tflite_mobilenet//:mobilenet_quant_v1_224.tflite", "@tflite_conv_actions_frozen//:conv_actions_frozen.tflite", - "//tensorflow/contrib/lite/examples/android/assets:conv_actions_labels.txt", + "//tensorflow/contrib/lite/examples/android/app/src/main/assets:conv_actions_labels.txt", "@tflite_mobilenet_ssd//:mobilenet_ssd.tflite", - "//tensorflow/contrib/lite/examples/android/assets:box_priors.txt", - "//tensorflow/contrib/lite/examples/android/assets:coco_labels_list.txt", + "//tensorflow/contrib/lite/examples/android/app/src/main/assets:box_priors.txt", + "//tensorflow/contrib/lite/examples/android/app/src/main/assets:coco_labels_list.txt", ], assets_dir = "", custom_package = "org.tensorflow.lite.demo", inline_constants = 1, - manifest = "AndroidManifest.xml", + manifest = "app/src/main/AndroidManifest.xml", nocompress_extensions = [ ".tflite", ], - resource_files = glob(["res/**"]), + resource_files = glob(["app/src/main/res/**"]), tags = [ "manual", "notap", @@ -57,31 +57,3 @@ android_binary( "//tensorflow/contrib/lite/java:tensorflowlite", ], ) - -filegroup( - name = "all_files", - srcs = glob( - ["**/*"], - exclude = [ - "**/METADATA", - "**/OWNERS", - "bin/**", - "gen/**", - "gradleBuild/**", - "libs/**", - ], - ), - visibility = ["//tensorflow:__subpackages__"], -) - -filegroup( - name = "java_files", - srcs = glob(["src/**/*.java"]), -) - -filegroup( - name = "resource_files", - srcs = glob(["res/**"]), -) - -exports_files(["AndroidManifest.xml"]) diff --git a/tensorflow/contrib/lite/examples/android/android.iml b/tensorflow/contrib/lite/examples/android/android.iml new file mode 100644 index 0000000000..f0a5ac2bf4 --- /dev/null +++ b/tensorflow/contrib/lite/examples/android/android.iml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="java-gradle" name="Java-Gradle"> + <configuration> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> + <option name="BUILDABLE" value="false" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/tensorflow/contrib/lite/examples/android/app/build.gradle b/tensorflow/contrib/lite/examples/android/app/build.gradle new file mode 100644 index 0000000000..8e0a98ed63 --- /dev/null +++ b/tensorflow/contrib/lite/examples/android/app/build.gradle @@ -0,0 +1,60 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + buildToolsVersion '26.0.2' + defaultConfig { + applicationId "org.tensorflow.lite.demo" + minSdkVersion 15 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + // Remove this block. + jackOptions { + enabled true + } + } + lintOptions { + abortOnError false + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + aaptOptions { + noCompress "tflite" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +repositories { + maven { + url 'https://google.bintray.com/tensorflow' + } +} + +// import DownloadModels task +project.ext.ASSET_DIR = projectDir.toString() + '/src/main/assets' +project.ext.TMP_DIR = project.buildDir.toString() + '/downloads' + +// Download default models; if you wish to use your own models then +// place them in the "assets" directory and comment out this line. +apply from: "download-models.gradle" + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'org.tensorflow:tensorflow-lite:0.0.0-nightly' + + testCompile 'junit:junit:4.12' +} diff --git a/tensorflow/contrib/lite/examples/android/app/download-models.gradle b/tensorflow/contrib/lite/examples/android/app/download-models.gradle new file mode 100644 index 0000000000..8e65dc076f --- /dev/null +++ b/tensorflow/contrib/lite/examples/android/app/download-models.gradle @@ -0,0 +1,73 @@ +/* + * download-models.gradle + * Downloads model files from ${MODEL_URL} into application's asset folder + * Input: + * project.ext.TMP_DIR: absolute path to hold downloaded zip files + * project.ext.ASSET_DIR: absolute path to save unzipped model files + * Output: + * 3 model files will be downloaded into given folder of ext.ASSET_DIR + */ +// hard coded model files +// LINT.IfChange + +def models = ['conv_actions_tflite.zip', + 'mobilenet_ssd_tflite_v1.zip', + 'mobilenet_v1_224_android_quant_2017_11_08.zip'] +// LINT.ThenChange(//tensorflow/examples/android/BUILD) + +// Root URL for model archives +def MODEL_URL = 'https://storage.googleapis.com/download.tensorflow.org/models/tflite' + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'de.undercouch:gradle-download-task:3.2.0' + } +} + +import de.undercouch.gradle.tasks.download.Download +task downloadFile(type: Download){ + for (f in models) { + def modelUrl = MODEL_URL + "/" + f + println "Downloading ${f} from ${modelUrl}" + src modelUrl + } + + dest new File(project.ext.TMP_DIR) + overwrite true +} + +task extractModels(type: Copy) { + for (f in models) { + def localFile = f.split("/")[-1] + from zipTree(project.ext.TMP_DIR + '/' + localFile) + } + + into file(project.ext.ASSET_DIR) + fileMode 0644 + exclude '**/LICENSE' + + def needDownload = false + for (f in models) { + def localFile = f.split("/")[-1] + if (!(new File(project.ext.TMP_DIR + '/' + localFile)).exists()) { + needDownload = true + } + } + + if (needDownload) { + dependsOn downloadFile + } +} + +tasks.whenTaskAdded { task -> + if (task.name == 'assembleDebug') { + task.dependsOn 'extractModels' + } + if (task.name == 'assembleRelease') { + task.dependsOn 'extractModels' + } +} + diff --git a/tensorflow/contrib/lite/examples/android/AndroidManifest.xml b/tensorflow/contrib/lite/examples/android/app/src/main/AndroidManifest.xml index bc9574d646..bc9574d646 100644 --- a/tensorflow/contrib/lite/examples/android/AndroidManifest.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/examples/android/assets/BUILD b/tensorflow/contrib/lite/examples/android/app/src/main/assets/BUILD index dd0cd6c98f..dd0cd6c98f 100644 --- a/tensorflow/contrib/lite/examples/android/assets/BUILD +++ b/tensorflow/contrib/lite/examples/android/app/src/main/assets/BUILD diff --git a/tensorflow/contrib/lite/examples/android/assets/box_priors.txt b/tensorflow/contrib/lite/examples/android/app/src/main/assets/box_priors.txt index 7246b073fe..7246b073fe 100644 --- a/tensorflow/contrib/lite/examples/android/assets/box_priors.txt +++ b/tensorflow/contrib/lite/examples/android/app/src/main/assets/box_priors.txt diff --git a/tensorflow/contrib/lite/examples/android/assets/coco_labels_list.txt b/tensorflow/contrib/lite/examples/android/app/src/main/assets/coco_labels_list.txt index 5a70ff82aa..5a70ff82aa 100644 --- a/tensorflow/contrib/lite/examples/android/assets/coco_labels_list.txt +++ b/tensorflow/contrib/lite/examples/android/app/src/main/assets/coco_labels_list.txt diff --git a/tensorflow/contrib/lite/examples/android/assets/conv_actions_labels.txt b/tensorflow/contrib/lite/examples/android/app/src/main/assets/conv_actions_labels.txt index ba416458b0..ba416458b0 100644 --- a/tensorflow/contrib/lite/examples/android/assets/conv_actions_labels.txt +++ b/tensorflow/contrib/lite/examples/android/app/src/main/assets/conv_actions_labels.txt diff --git a/tensorflow/contrib/lite/examples/android/assets/labels_mobilenet_quant_v1_224.txt b/tensorflow/contrib/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt index fe811239d8..fe811239d8 100644 --- a/tensorflow/contrib/lite/examples/android/assets/labels_mobilenet_quant_v1_224.txt +++ b/tensorflow/contrib/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/AutoFitTextureView.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java index eff24afdba..eff24afdba 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/AutoFitTextureView.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java index 15d5456f02..15d5456f02 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraActivity.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java index 51a1adb538..51a1adb538 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/Classifier.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java index 07995febaf..07995febaf 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/Classifier.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ClassifierActivity.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java index dcbbefbeab..dcbbefbeab 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ClassifierActivity.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/DetectorActivity.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java index de997e454a..de997e454a 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/DetectorActivity.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/LegacyCameraConnectionFragment.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java index fd83029753..fd83029753 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/LegacyCameraConnectionFragment.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/OverlayView.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java index 0f8d109fb4..0f8d109fb4 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/OverlayView.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognitionScoreView.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java index 31a4b07c83..31a4b07c83 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognitionScoreView.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognizeCommands.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java index 9e91aea7ef..9e91aea7ef 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/RecognizeCommands.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ResultsView.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java index 211d7e66fb..211d7e66fb 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/ResultsView.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/SpeechActivity.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java index 9c9c30bc09..9c9c30bc09 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/SpeechActivity.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteImageClassifier.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java index d75c3ceada..d75c3ceada 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteImageClassifier.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java index bfb4a0a04b..bfb4a0a04b 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/AssetUtils.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java index c50efdf889..c50efdf889 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/AssetUtils.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/BorderedText.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java index decfc3d879..decfc3d879 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/BorderedText.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/ImageUtils.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java index e02c655917..e02c655917 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/ImageUtils.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Logger.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java index 0d984096a0..0d984096a0 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Logger.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Size.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java index ef15d14daa..ef15d14daa 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/Size.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/SplitTimer.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java index 459b0a0d4d..459b0a0d4d 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/env/SplitTimer.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java index af6af2bc8f..af6af2bc8f 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java diff --git a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java index 8b4248d8fb..8b4248d8fb 100644 --- a/tensorflow/contrib/lite/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java +++ b/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java diff --git a/tensorflow/contrib/lite/examples/android/res/animator/color_animation.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/animator/color_animation.xml index 891d8cc1d4..891d8cc1d4 100644 --- a/tensorflow/contrib/lite/examples/android/res/animator/color_animation.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/animator/color_animation.xml diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_action_info.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png Binary files differindex 32bd1aabca..32bd1aabca 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_action_info.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_launcher.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex b3113cd15c..b3113cd15c 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/ic_launcher.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/tile.9.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png Binary files differindex 135862883e..135862883e 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-hdpi/tile.9.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_action_info.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png Binary files differindex 8efbbf8b3c..8efbbf8b3c 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_action_info.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_launcher.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 51f87ee650..51f87ee650 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-mdpi/ic_launcher.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_action_info.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png Binary files differindex ba143ea7a8..ba143ea7a8 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_action_info.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_launcher.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 6361d792da..6361d792da 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-xhdpi/ic_launcher.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_action_info.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png Binary files differindex 394eb7e534..394eb7e534 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_action_info.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_launcher.png b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex 2e27bec978..2e27bec978 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable-xxhdpi/ic_launcher.png +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/res/drawable/border.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable/border.xml index dd1d64d1d6..dd1d64d1d6 100644 --- a/tensorflow/contrib/lite/examples/android/res/drawable/border.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable/border.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/activity_camera.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_camera.xml index 1a22d4b33e..1a22d4b33e 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/activity_camera.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_camera.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/activity_speech.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_speech.xml index 2fe1338da5..2fe1338da5 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/activity_speech.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_speech.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml index a1bbdf1702..a1bbdf1702 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_stylize.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml index 1cdb24cab0..1cdb24cab0 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_stylize.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_tracking.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml index ca18ea075d..ca18ea075d 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/camera_connection_fragment_tracking.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml diff --git a/tensorflow/contrib/lite/examples/android/res/layout/list_text_item.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/list_text_item.xml index 526017fbb2..526017fbb2 100644 --- a/tensorflow/contrib/lite/examples/android/res/layout/list_text_item.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/list_text_item.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-dimens.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml index 820eda0e55..820eda0e55 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-dimens.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml index 09303314e9..09303314e9 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-sw600dp/template-styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-v11/styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/styles.xml index c2d1babc12..c2d1babc12 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-v11/styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-v11/template-styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/template-styles.xml index 1ad048439c..1ad048439c 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-v11/template-styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-v14/styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v14/styles.xml index cc370849c0..cc370849c0 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-v14/styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v14/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-v21/base-colors.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-colors.xml index c16da7c51c..c16da7c51c 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-v21/base-colors.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-colors.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values-v21/base-template-styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml index 8890d2f4a5..8890d2f4a5 100644 --- a/tensorflow/contrib/lite/examples/android/res/values-v21/base-template-styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/attrs.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/attrs.xml index 56e5beae76..56e5beae76 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/attrs.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/attrs.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/base-strings.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/base-strings.xml index ebc5dc8423..ebc5dc8423 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/base-strings.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/base-strings.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/colors.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/colors.xml index 584ed6052d..584ed6052d 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/colors.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/colors.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/strings.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/strings.xml index ea20ee78e0..ea20ee78e0 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/strings.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/strings.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/styles.xml index dd1d973e9b..dd1d973e9b 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/template-dimens.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-dimens.xml index 069977b6a6..069977b6a6 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/template-dimens.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-dimens.xml diff --git a/tensorflow/contrib/lite/examples/android/res/values/template-styles.xml b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-styles.xml index 1b87714a49..1b87714a49 100644 --- a/tensorflow/contrib/lite/examples/android/res/values/template-styles.xml +++ b/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/build.gradle b/tensorflow/contrib/lite/examples/android/build.gradle index 0d4de35815..a47fa4bbf6 100644 --- a/tensorflow/contrib/lite/examples/android/build.gradle +++ b/tensorflow/contrib/lite/examples/android/build.gradle @@ -1,52 +1,23 @@ -apply plugin: 'com.android.application' +// Top-level build file where you can add configuration options common to all sub-projects/modules. -android { - compileSdkVersion 26 - buildToolsVersion "26.0.1" - defaultConfig { - applicationId "org.tensorflow.lite.demo" - minSdkVersion 15 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - // Remove this block. - jackOptions { - enabled true - } - } - lintOptions { - abortOnError false - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - aaptOptions { - noCompress "tflite" +buildscript { + repositories { + jcenter() } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files } } -repositories { - maven { - url 'https://google.bintray.com/tensorflow' +allprojects { + repositories { + jcenter() } } -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'org.tensorflow:tensorflow-lite:+' - - testCompile 'junit:junit:4.12' +task clean(type: Delete) { + delete rootProject.buildDir } diff --git a/tensorflow/contrib/lite/examples/android/settings.gradle b/tensorflow/contrib/lite/examples/android/settings.gradle new file mode 100644 index 0000000000..e7b4def49c --- /dev/null +++ b/tensorflow/contrib/lite/examples/android/settings.gradle @@ -0,0 +1 @@ +include ':app' |