summaryrefslogtreecommitdiff
path: root/test-base
diff options
context:
space:
mode:
authorArtur Satayev <satayev@google.com>2019-12-10 17:47:56 +0000
committerArtur Satayev <satayev@google.com>2020-01-09 13:52:18 +0000
commit54af4fc42ac093c7dc84787b8bc98733207c0496 (patch)
treebc1386d5d9676f5576ff1f8ec479eee8e00e5300 /test-base
parent07dcca55fc93fff29fe342eafc2e94d1e3addba1 (diff)
Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23 Merged-In: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23
Diffstat (limited to 'test-base')
-rw-r--r--test-base/hiddenapi/Android.bp5
-rw-r--r--test-base/hiddenapi/src/android/test/AndroidTestCase.java2
-rw-r--r--test-base/hiddenapi/src/android/test/InstrumentationTestCase.java2
-rw-r--r--test-base/hiddenapi/src/junit/framework/TestCase.java2
-rw-r--r--test-base/hiddenapi/src/junit/framework/TestSuite.java2
5 files changed, 8 insertions, 5 deletions
diff --git a/test-base/hiddenapi/Android.bp b/test-base/hiddenapi/Android.bp
index c4e0fab4a1a8..c202467517aa 100644
--- a/test-base/hiddenapi/Android.bp
+++ b/test-base/hiddenapi/Android.bp
@@ -25,5 +25,8 @@ java_library {
srcs: ["src/**/*.java"],
- libs: ["android.test.base"],
+ libs: [
+ "android.test.base",
+ "unsupportedappusage",
+ ],
}
diff --git a/test-base/hiddenapi/src/android/test/AndroidTestCase.java b/test-base/hiddenapi/src/android/test/AndroidTestCase.java
index 2b9beb160110..fcb8d432a631 100644
--- a/test-base/hiddenapi/src/android/test/AndroidTestCase.java
+++ b/test-base/hiddenapi/src/android/test/AndroidTestCase.java
@@ -16,7 +16,7 @@
package android.test;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import junit.framework.TestCase;
diff --git a/test-base/hiddenapi/src/android/test/InstrumentationTestCase.java b/test-base/hiddenapi/src/android/test/InstrumentationTestCase.java
index 139cd18a176c..a48a56c612d6 100644
--- a/test-base/hiddenapi/src/android/test/InstrumentationTestCase.java
+++ b/test-base/hiddenapi/src/android/test/InstrumentationTestCase.java
@@ -16,7 +16,7 @@
package android.test;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
import junit.framework.TestCase;
diff --git a/test-base/hiddenapi/src/junit/framework/TestCase.java b/test-base/hiddenapi/src/junit/framework/TestCase.java
index 5a5486108a7a..59fbe2b94561 100644
--- a/test-base/hiddenapi/src/junit/framework/TestCase.java
+++ b/test-base/hiddenapi/src/junit/framework/TestCase.java
@@ -16,7 +16,7 @@
package junit.framework;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
/**
* Stub only
diff --git a/test-base/hiddenapi/src/junit/framework/TestSuite.java b/test-base/hiddenapi/src/junit/framework/TestSuite.java
index 368c661dbfa4..32305c9149c0 100644
--- a/test-base/hiddenapi/src/junit/framework/TestSuite.java
+++ b/test-base/hiddenapi/src/junit/framework/TestSuite.java
@@ -16,7 +16,7 @@
package junit.framework;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
import java.lang.reflect.Method;