From 2eeaa138501cb4fd3d02ffed1e607d96dce723bb Mon Sep 17 00:00:00 2001
From: gerry <gfan@google.com>
Date: Wed, 11 Jul 2018 14:53:46 -0700
Subject: [PATCH] Android Build: remove libcutils dependency, update .gitignore

---
 android/WALT/.gitignore                  | 15 ++++++++-------
 android/WALT/app/build.gradle            |  3 ---
 android/WALT/app/src/main/jni/Android.mk |  2 --
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/android/WALT/.gitignore b/android/WALT/.gitignore
index 579b981..f3284d4 100644
--- a/android/WALT/.gitignore
+++ b/android/WALT/.gitignore
@@ -1,10 +1,11 @@
-.gradle
-.idea
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+**/build
+**/obj
+**/.gradle
+**/.idea
+**/*.iml
+**/.externalNativeBuild
+**/local.properties
 .DS_Store
-/build
 /captures
-/app/src/main/obj
 /app/src/main/libs
+
diff --git a/android/WALT/app/build.gradle b/android/WALT/app/build.gradle
index ec99946..4e52e25 100644
--- a/android/WALT/app/build.gradle
+++ b/android/WALT/app/build.gradle
@@ -11,9 +11,6 @@ android {
         targetSdkVersion 23
         versionCode 9
         versionName "0.1.9"
-        externalNativeBuild.ndkBuild {
-            arguments "APP_PLATFORM=android-14", "APP_ALLOW_MISSING_DEPS=true"
-        }
     }
 
     externalNativeBuild.ndkBuild {
diff --git a/android/WALT/app/src/main/jni/Android.mk b/android/WALT/app/src/main/jni/Android.mk
index 3307036..29225ac 100644
--- a/android/WALT/app/src/main/jni/Android.mk
+++ b/android/WALT/app/src/main/jni/Android.mk
@@ -22,8 +22,6 @@ LOCAL_SRC_FILES := sync_clock_jni.c sync_clock.c player.c
 
 LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror
 
-# needed for logcat
-LOCAL_SHARED_LIBRARIES := libcutils
 
 LOCAL_LDLIBS := -lOpenSLES -llog