Update gradle call to ndk-build

rmtheis · Jan 30, 2016 · 918f7f1 · 918f7f1
1 parent bdf1429
commit 918f7f1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/eyes-two/AndroidManifest.xml b/eyes-two/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 Google Inc.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.googlecode.eyesfree.ocr"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="8" />
+
+</manifest>
diff --git a/eyes-two/build.gradle b/eyes-two/build.gradle
@@ -30,7 +30,8 @@ android {
     // Call external ndk-build(.cmd) script to build the native code
     task ndkBuild(type: Exec) {
         def ndkBuildExt = Os.isFamily(Os.FAMILY_WINDOWS) ? ".cmd" : ""
-        commandLine "ndk-build${ndkBuildExt}", '-C', file('src/main').absolutePath,
+        commandLine "${android.ndkDirectory}/ndk-build${ndkBuildExt}",
+                '-C', file('src/main').absolutePath,
                 '-j', Runtime.runtime.availableProcessors()
     }
 
@@ -41,7 +42,8 @@ android {
     // Cleanup task to remove previously generated binaries
     task ndkClean(type: Exec) {
         def ndkBuildExt = Os.isFamily(Os.FAMILY_WINDOWS) ? ".cmd" : ""
-        commandLine "ndk-build${ndkBuildExt}", '-C', file('src/main').absolutePath, 'clean'
+        commandLine "${android.ndkDirectory}/ndk-build${ndkBuildExt}",
+                '-C', file('src/main').absolutePath, 'clean'
     }
 
     tasks.withType(Delete) {

diff --git a/tess-two/build.gradle b/tess-two/build.gradle
@@ -35,7 +35,8 @@ android {
     // Call external ndk-build(.cmd) script to build the native code
     task ndkBuild(type: Exec) {
         def ndkBuildExt = Os.isFamily(Os.FAMILY_WINDOWS) ? ".cmd" : ""
-        commandLine "ndk-build${ndkBuildExt}", '-C', file('.').absolutePath,
+        commandLine "${android.ndkDirectory}/ndk-build${ndkBuildExt}",
+                '-C', file('.').absolutePath,
 				'-j', Runtime.runtime.availableProcessors()
     }
 
@@ -46,7 +47,8 @@ android {
     // Cleanup task to remove previously generated binaries
     task ndkClean(type: Exec) {
         def ndkBuildExt = Os.isFamily(Os.FAMILY_WINDOWS) ? ".cmd" : ""
-        commandLine "ndk-build${ndkBuildExt}", '-C', file('.').absolutePath, 'clean'
+        commandLine "${android.ndkDirectory}/ndk-build${ndkBuildExt}",
+                '-C', file('.').absolutePath, 'clean'
     }
 
     tasks.withType(Delete) {