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
diff --git a/proguard.flags b/proguard.flags
index 6278c61..f586b72 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,5 @@
+-ignorewarnings
+
-keep class com.android.contacts.model.Sources {
public <init>(...);
}
@@ -9,9 +11,6 @@
public void *(android.view.MenuItem);
}
-# Feature highlight library. See b/29877098
--keep class com.google.android.libraries.material.featurehighlight.** { *; }
-
# Needed for tests
-keep class com.android.contacts.compat.CompatUtils { *; }
-keep class com.android.contacts.Collapser { *; }
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" />
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
index 46b5f40..aa52c08 100644
--- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -41,6 +41,7 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.Suppress;
import android.support.test.runner.AndroidJUnit4;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
@@ -81,6 +82,7 @@
* These should probably be converted to espresso tests because espresso does a better job of
* waiting for the app to be idle once espresso library is added
*/
+@Suppress
@LargeTest
@RunWith(AndroidJUnit4.class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)