diff options
| author | 2019-08-19 09:13:55 +0000 | |
|---|---|---|
| committer | 2019-08-19 09:13:55 +0000 | |
| commit | d39df1d0acc9fd3b585e60b90fa7787b0cdbb20c (patch) | |
| tree | 759bf7b460952ac8044a49525102c8e574a94881 | |
| parent | 4c322503bb6ad612970d64f7d4f29ca6d2d1f1b0 (diff) | |
| parent | 005d7350d224dfc69a001050cf6e127856e7b476 (diff) | |
Merge "Cover framework code in hiddenapi-mappings."
| -rw-r--r-- | Android.bp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index e7e0774f4856..2896f28f5e43 100644 --- a/Android.bp +++ b/Android.bp @@ -25,10 +25,8 @@ // // READ ME: ######################################################## -java_defaults { - name: "framework-defaults", - installable: true, - +filegroup { + name: "framework-defaults-java-srcs", srcs: [ // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS "core/java/**/*.java", @@ -47,7 +45,15 @@ java_defaults { "wifi/java/**/*.java", "keystore/java/**/*.java", "rs/java/**/*.java", + ], +} +java_defaults { + name: "framework-defaults", + installable: true, + + srcs: [ + ":framework-defaults-java-srcs", ":framework-javastream-protos", "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl", @@ -1606,10 +1612,10 @@ droidstubs { name: "hiddenapi-mappings", defaults: ["metalava-api-stubs-default"], srcs: [ - ":openjdk_java_files", + ":framework-defaults-java-srcs", ":non_openjdk_java_files", + ":openjdk_java_files", ":opt-telephony-common-srcs", - "core/java/**/*.java", ], arg_files: [ "core/res/AndroidManifest.xml", |