Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac

Browse Source 
am: ad6cf4a97c

Change-Id: Ia14fb9b3d20f0f0304232c816c0546a71ece15a1
This commit is contained in:
satayev
2019-08-19 02:47:37 -07:00
committed by android-build-merger
parent fbc11d88e1 ad6cf4a97c
commit efd6f89c7b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Android.bp
View File

@@ -25,10 +25,8 @@
// //
// READ ME: ######################################################## // READ ME: ########################################################
java_defaults { filegroup {
name: "framework-defaults", name: "framework-defaults-java-srcs",
installable: true,
srcs: [ srcs: [
// From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS
"core/java/**/*.java", "core/java/**/*.java",
@@ -47,7 +45,15 @@ java_defaults {
"wifi/java/**/*.java", "wifi/java/**/*.java",
"keystore/java/**/*.java", "keystore/java/**/*.java",
"rs/java/**/*.java", "rs/java/**/*.java",
],
}
java_defaults {
name: "framework-defaults",
installable: true,
srcs: [
":framework-defaults-java-srcs",
":framework-javastream-protos", ":framework-javastream-protos",
"core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl", "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl",
@@ -1753,10 +1759,10 @@ droidstubs {
name: "hiddenapi-mappings", name: "hiddenapi-mappings",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
srcs: [ srcs: [
":openjdk_java_files", ":framework-defaults-java-srcs",
":non_openjdk_java_files", ":non_openjdk_java_files",
":openjdk_java_files",
":opt-telephony-common-srcs", ":opt-telephony-common-srcs",
"core/java/**/*.java",
], ],
arg_files: [ arg_files: [
"core/res/AndroidManifest.xml", "core/res/AndroidManifest.xml",