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

Merge "bpfmt -w Android.bp"

Browse Source 
am: c51996859d

Change-Id: I4fcfe15d94114e327df91c3e6ada261929727b63
This commit is contained in:
Tobias Thierer
2019-05-29 15:12:31 -07:00
committed by android-build-merger
parent 02a8e8c7e3 c51996859d
commit 829f3f0e14
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Android.bp
View File

@@ -669,7 +669,7 @@ java_defaults {
"system/security/keystore/binder", "system/security/keystore/binder",
], ],
generate_get_transaction_name: true generate_get_transaction_name: true,
}, },
exclude_srcs: [ exclude_srcs: [
@@ -791,7 +791,7 @@ gensrcs {
name: "framework-javastream-protos", name: "framework-javastream-protos",
depfile: true, depfile: true,
tool_files: [ "tools/genprotos.sh", ], tool_files: ["tools/genprotos.sh"],
tools: [ tools: [
"aprotoc", "aprotoc",
"protoc-gen-javastream", "protoc-gen-javastream",
@@ -826,7 +826,7 @@ filegroup {
"core/java/android/annotation/UnsupportedAppUsage.java", "core/java/android/annotation/UnsupportedAppUsage.java",
"core/java/com/android/internal/annotations/GuardedBy.java", "core/java/com/android/internal/annotations/GuardedBy.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java", "core/java/com/android/internal/annotations/VisibleForTesting.java",
] ],
} }
filegroup { filegroup {
@@ -847,7 +847,7 @@ filegroup {
"core/java/com/android/internal/util/TrafficStatsConstants.java", "core/java/com/android/internal/util/TrafficStatsConstants.java",
"core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/WakeupMessage.java",
"core/java/android/net/shared/*.java", "core/java/android/net/shared/*.java",
] ],
} }
// Build ext.jar // Build ext.jar
@@ -1559,10 +1559,9 @@ droidstubs {
args: metalava_framework_docs_args + args: metalava_framework_docs_args +
" --show-unannotated " + " --show-unannotated " +
" --show-annotation android.annotation.SystemApi " + " --show-annotation android.annotation.SystemApi " +
" --show-annotation android.annotation.TestApi " " --show-annotation android.annotation.TestApi ",
} }
droidstubs { droidstubs {
name: "hiddenapi-mappings", name: "hiddenapi-mappings",
defaults: ["metalava-api-stubs-default"], defaults: ["metalava-api-stubs-default"],
@@ -1581,7 +1580,7 @@ droidstubs {
" --hide UnhiddenSystemApi " + " --hide UnhiddenSystemApi " +
" --show-unannotated " + " --show-unannotated " +
" --show-annotation android.annotation.SystemApi " + " --show-annotation android.annotation.SystemApi " +
" --show-annotation android.annotation.TestApi " " --show-annotation android.annotation.TestApi ",
} }
filegroup { filegroup {
@@ -1685,5 +1684,5 @@ filegroup {
aidl_mapping { aidl_mapping {
name: "framework-aidl-mappings", name: "framework-aidl-mappings",
srcs: [":framework-defaults"], srcs: [":framework-defaults"],
output: "framework-aidl-mappings.txt" output: "framework-aidl-mappings.txt",
} }