| commit | eae0422633ec59fd28f94dadae9cdfb1dd125869 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Thu Feb 18 01:21:59 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 18 01:22:00 2016 +0000 |
| tree | 541f67a451b1cf718a8e36ec56af5a716d7c439f | |
| parent | 32a34d337977618d95ab183f65627a4ff4b9a390 [diff] | |
| parent | 2a24891ca7399bcb09121d7898c799fb97709911 [diff] |
Merge "Suppress warnings of MultiDexLegacyAndException" into nyc-dev
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index edeecb2..26f768b 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
@@ -29,6 +29,8 @@ LOCAL_DEX_PREOPT := false +LOCAL_JAVACFLAGS := -nowarn + mainDexList:= \ $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/Test.java b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/Test.java index 5e931bc..8d065a4 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/Test.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/Test.java
@@ -15,14 +15,13 @@ */ package com.android.multidexlegacyandexception; -import android.test.ActivityInstrumentationTestCase2; - /** * Run the tests with: <code>adb shell am instrument -w com.android.multidexlegacyandexception/android.test.InstrumentationTestRunner </code> */ -public class Test extends ActivityInstrumentationTestCase2<MainActivity> { +@SuppressWarnings("deprecation") +public class Test extends android.test.ActivityInstrumentationTestCase2<MainActivity> { public Test() { super(MainActivity.class); }