diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp index 9497085a82ca..67b088c2dc00 100644 --- a/Android.bp +++ b/Android.bp @@ -34,6 +34,27 @@ filegroup { path: "core/java", } +// These are subset of framework-core-sources that are needed by the +// android.test.mock library. Ideally, the library should use public APIs only, +// but unfortunately its API signature has some references to these private APIs. +filegroup { + name: "framework-core-sources-for-test-mock", + srcs: [ + "core/java/android/app/IApplicationThread.aidl", + "core/java/android/app/IServiceConnection.aidl", + "core/java/android/content/IContentProvider.java", + "core/java/android/content/pm/IPackageDataObserver.aidl", + "core/java/android/content/pm/InstantAppInfo.java", + "core/java/android/content/pm/KeySet.java", + "core/java/android/content/pm/PackageManager.java", + "core/java/android/content/pm/VerifierDeviceIdentity.java", + "core/java/android/content/res/Resources.java", + "core/java/android/os/storage/VolumeInfo.java", + "core/java/android/view/DisplayAdjustments.java", + ], + path: "core/java", +} + filegroup { name: "framework-drm-sources", srcs: [ @@ -1424,8 +1445,6 @@ droidstubs { name: "hiddenapi-mappings", defaults: ["metalava-api-stubs-default"], srcs: [ - ":non_openjdk_java_files", - ":openjdk_java_files", ":opt-telephony-common-srcs", ], @@ -1441,29 +1460,6 @@ droidstubs { " --show-annotation android.annotation.TestApi ", } -filegroup { - name: "apache-http-stubs-sources", - srcs: [ - "core/java/org/apache/http/conn/ConnectTimeoutException.java", - "core/java/org/apache/http/conn/scheme/HostNameResolver.java", - "core/java/org/apache/http/conn/scheme/LayeredSocketFactory.java", - "core/java/org/apache/http/conn/scheme/SocketFactory.java", - "core/java/org/apache/http/conn/ssl/AbstractVerifier.java", - "core/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java", - "core/java/org/apache/http/conn/ssl/AndroidDistinguishedNameParser.java", - "core/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java", - "core/java/org/apache/http/conn/ssl/SSLSocketFactory.java", - "core/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java", - "core/java/org/apache/http/conn/ssl/X509HostnameVerifier.java", - "core/java/org/apache/http/params/CoreConnectionPNames.java", - "core/java/org/apache/http/params/HttpConnectionParams.java", - "core/java/org/apache/http/params/HttpParams.java", - "core/java/android/net/http/SslCertificate.java", - "core/java/android/net/http/SslError.java", - "core/java/com/android/internal/util/HexDump.java", - ], -} - droidstubs { name: "api-stubs-docs", defaults: ["metalava-api-stubs-default"], @@ -1539,6 +1535,10 @@ droidstubs { api_file: "api/test-current.txt", removed_api_file: "api/test-removed.txt", }, + api_lint: { + enabled: true, + baseline_file: "api/test-lint-baseline.txt", + }, }, } @@ -1623,7 +1623,6 @@ filegroup { filegroup { name: "framework-ims-common-shared-srcs", srcs: [ - "core/java/android/os/AsyncResult.java", "core/java/android/os/RegistrantList.java", "core/java/android/os/Registrant.java", "core/java/com/android/internal/os/SomeArgs.java", |