diff options
| author | John Shao <johnshao@google.com> | 2017-01-26 15:11:16 -0800 |
|---|---|---|
| committer | John Shao <johnshao@google.com> | 2017-01-26 15:11:16 -0800 |
| commit | 687432da283c11a953b6b3a8114183506c923e1a (patch) | |
| tree | a866d0763919b52857c25850aeb10f648ff15e02 /tests | |
| parent | ba92cff2725b6d120602ee3e343b5bf1115538e4 (diff) | |
| download | Contacts-687432da283c11a953b6b3a8114183506c923e1a.tar.gz | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | tests/src/com/android/contacts/activities/SimImportActivityTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 740e2937c..e3d9820d1 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 46b5f4054..aa52c08a9 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.provider.ContactsContract.Data; 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 @@ import java.util.concurrent.TimeUnit; * 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) |