diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:58 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:58 -0700 |
| commit | d51828a0e0222dadc3363078098aa19e981ed4ce (patch) | |
| tree | 321c6dfa7cca8429a1cdd044b720b1ba990a55d0 | |
| parent | 3adb98b7e9b604ca9cbca46c778abcdc2692f330 (diff) | |
| parent | 667e8efae3dd6c4d11eba30667bdd3c26e318705 (diff) | |
| download | platform_frameworks_opt_vcard-d51828a0e0222dadc3363078098aa19e981ed4ce.tar.gz platform_frameworks_opt_vcard-d51828a0e0222dadc3363078098aa19e981ed4ce.tar.bz2 platform_frameworks_opt_vcard-d51828a0e0222dadc3363078098aa19e981ed4ce.zip | |
Merge Android Pie into master
Bug: 112104996
Change-Id: Ie7f929f068919d58dcb5e06163a6cfb5d602444d
| -rw-r--r-- | tests/Android.mk | 4 | ||||
| -rw-r--r-- | tests/AndroidTest.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 500c2ae..244d31b 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -21,8 +21,8 @@ LOCAL_PACKAGE_NAME := AndroidVCardTests LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock +LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard junit LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.vcard.* LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := com.android.vcard.tests.* diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml index 8be2809..0f7ce2c 100644 --- a/tests/AndroidTest.xml +++ b/tests/AndroidTest.xml @@ -23,5 +23,6 @@ <test class="com.android.tradefed.testtype.InstrumentationTest" > <option name="package" value="com.android.vcard.tests" /> <option name="runner" value="android.test.InstrumentationTestRunner" /> + <option name="hidden-api-checks" value="false"/> </test> </configuration> |