Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687432da authored by John Shao's avatar John Shao
Browse files

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
parent ba92cff2

proguard.flags

+2 −3
Original line number Original line Diff line number Diff line 
-ignorewarnings



-keep class com.android.contacts.model.Sources {

-keep class com.android.contacts.model.Sources {

  public <init>(...);

  public <init>(...);

}

}
@@ -9,9 +11,6 @@ 
  public void *(android.view.MenuItem);

  public void *(android.view.MenuItem);

}

}





# Feature highlight library.  See b/29877098

-keep class com.google.android.libraries.material.featurehighlight.** { *; }



# Needed for tests

# Needed for tests

-keep class com.android.contacts.compat.CompatUtils { *; }

-keep class com.android.contacts.compat.CompatUtils { *; }

-keep class com.android.contacts.Collapser { *; }

-keep class com.android.contacts.Collapser { *; }

tests/AndroidManifest.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -17,9 +17,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.contacts.tests">

    package="com.android.contacts.tests">





    <uses-sdk

    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />

        android:minSdkVersion="21"

        android:targetSdkVersion="25" />





    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

tests/src/com/android/contacts/activities/SimImportActivityTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import android.provider.ContactsContract.Data; 
import android.support.test.InstrumentationRegistry;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.support.test.filters.SdkSuppress;

import android.support.test.filters.SdkSuppress;

import android.support.test.filters.Suppress;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

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

 * 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

 * waiting for the app to be idle once espresso library is added

 */

 */

@Suppress

@LargeTest

@LargeTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)