diff options
| author | Jiyong Park <jiyong@google.com> | 2019-11-02 01:20:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-02 01:20:38 -0700 |
| commit | dcfd8ddce7738fe9235f34c82202e44eefc7efcf (patch) | |
| tree | 3cb9d4447fd3b413e8c59e16bbd429075d178163 | |
| parent | b5cf529724b3ccd1a1ff0c0f68455f7fe930f9f1 (diff) | |
| parent | a321a944eaaa7ba1ee4e930d319254c072cad0d2 (diff) | |
Merge "android.test.mock is built with much less number of sources" am: f0b9dfc0b1
am: a321a944ea
Change-Id: I5f8ac544302ecc1fe9972bcb7237586b8adcc70a
| -rw-r--r-- | Android.bp | 21 | ||||
| -rw-r--r-- | test-mock/Android.bp | 10 |
2 files changed, 29 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 90dca0350a0c..d6478f186244 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: [ diff --git a/test-mock/Android.bp b/test-mock/Android.bp index 81b1e49ffed1..0b5d4460612d 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -19,8 +19,14 @@ java_sdk_library { name: "android.test.mock", - srcs: ["src/**/*.java"], - api_srcs: [":framework-all-sources"], + srcs: [ + "src/**/*.java", + // Note: Below are NOT APIs of this library. We only take APIs under + // the android.test.mock package. They however provide private APIs that + // android.test.mock APIs references to. + ":framework-core-sources-for-test-mock", + ":framework_native_aidl", + ], libs: ["framework-all"], api_packages: [ |