commit 687432da283c11a953b6b3a8114183506c923e1a
author John Shao <johnshao@google.com> Thu Jan 26 15:11:16 2017 -0800
committer John Shao <johnshao@google.com> Thu Jan 26 15:11:16 2017 -0800
tree a866d0763919b52857c25850aeb10f648ff15e02
parent ba92cff2725b6d120602ee3e343b5bf1115538e4

Build Aosp and GoogleContacts using Gradle

Changes needed to build Contacts and GoogleContacts
using gradle

Test: Built AOSP, Google and OEM contacts apps
  Ran tests (some failures still need to be looked at)

Bug: 34127945
Change-Id: Ia1620d11c14e8e558af706a4eee79a6a230abd59

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 740e293..e3d9820 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,9 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts.tests">
 
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="25" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />