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

Merge "bpfmt -w Android.bp" am: c51996859d

Browse Source 
am: 829f3f0e14

Change-Id: Iac27f88555798aea4d20477710aa5109fa6ef4eb
This commit is contained in:
Tobias Thierer
2019-05-29 15:17:40 -07:00
committed by android-build-merger
parent d447030e71 829f3f0e14
commit 7e1f1e7654
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Android.bp
View File

@@ -733,7 +733,7 @@ java_defaults {
"system/security/keystore/binder",
],
generate_get_transaction_name: true
generate_get_transaction_name: true,
},
exclude_srcs: [
@@ -871,7 +871,7 @@ gensrcs {
name: "framework-javastream-protos",
depfile: true,
tool_files: [ "tools/genprotos.sh", ],
tool_files: ["tools/genprotos.sh"],
tools: [
"aprotoc",
"protoc-gen-javastream",
@@ -882,13 +882,13 @@ gensrcs {
// end up with a command that is extremely long, potentially going passed MAX_ARG_STRLEN due to
// the way sbox rewrites the command. See b/70221552.
cmd: "$(location tools/genprotos.sh) " +
" $(location aprotoc) " +
" $(location protoc-gen-javastream) " +
" $(location soong_zip) " +
" $(genDir) " +
" $(depfile) " +
" $(in) " +
" $(out)",
" $(location aprotoc) " +
" $(location protoc-gen-javastream) " +
" $(location soong_zip) " +
" $(genDir) " +
" $(depfile) " +
" $(in) " +
" $(out)",
srcs: [
"core/proto/**/*.proto",
"libs/incident/**/*.proto",
@@ -906,7 +906,7 @@ filegroup {
"core/java/android/annotation/UnsupportedAppUsage.java",
"core/java/com/android/internal/annotations/GuardedBy.java",
"core/java/com/android/internal/annotations/VisibleForTesting.java",
]
],
}
filegroup {
@@ -927,7 +927,7 @@ filegroup {
"core/java/com/android/internal/util/TrafficStatsConstants.java",
"core/java/com/android/internal/util/WakeupMessage.java",
"core/java/android/net/shared/*.java",
]
],
}
// Build ext.jar
@@ -963,7 +963,7 @@ java_library_host {
type: "full",
},
errorprone: {
javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520
javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520
},
}
@@ -1248,11 +1248,11 @@ filegroup {
}
framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +
"-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
"-overview $(location core/java/overview.html) " +
// Federate Support Library references against local API file.
"-federate SupportLib https://developer.android.com " +
"-federationapi SupportLib $(location :current-support-api) "
"-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
"-overview $(location core/java/overview.html) " +
// Federate Support Library references against local API file.
"-federate SupportLib https://developer.android.com " +
"-federationapi SupportLib $(location :current-support-api) "
framework_docs_only_libs = [
"voip-common",
@@ -1350,7 +1350,7 @@ stubs_defaults {
doc_defaults {
name: "framework-docs-default",
libs: framework_docs_only_libs +
["stub-annotations"],
["stub-annotations"],
html_dirs: [
"docs/html",
],
@@ -1483,8 +1483,8 @@ droiddoc {
"android.whichdoc offline",
],
proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",
args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" +
" -offlinemode -title \"Android System SDK\" -referenceonly",
args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" +
" -offlinemode -title \"Android System SDK\" -referenceonly",
write_sdk_values: true,
static_doc_index_redirect: "docs/docs-documentation-redirect.html",
static_doc_properties: "docs/source.properties",
@@ -1501,7 +1501,7 @@ droiddoc {
"android.hasSamples true",
],
proofread_file: "online-sdk-docs-proofrerad.txt",
args: framework_docs_only_args +
args: framework_docs_only_args +
" -toroot / -samplegroup Admin " +
" -samplegroup Background " +
" -samplegroup Connectivity " +
@@ -1594,10 +1594,10 @@ droiddoc {
],
proofread_file: "ds-static-docs-proofrerad.txt",
args: framework_docs_only_args +
" -staticonly " +
" -toroot / " +
" -devsite " +
" -ignoreJdLinks ",
" -staticonly " +
" -toroot / " +
" -devsite " +
" -ignoreJdLinks ",
}
droiddoc {
@@ -1611,9 +1611,9 @@ droiddoc {
],
proofread_file: "ds-ref-navtree-docs-proofrerad.txt",
args: framework_docs_only_args +
" -toroot / " +
" -atLinksNavtree " +
" -navtreeonly ",
" -toroot / " +
" -atLinksNavtree " +
" -navtreeonly ",
}
droiddoc {
@@ -1653,8 +1653,8 @@ droiddoc {
],
proofread_file: "hidden-docs-proofrerad.txt",
args: framework_docs_only_args +
" -referenceonly " +
" -title \"Android SDK - Including hidden APIs.\"",
" -referenceonly " +
" -title \"Android SDK - Including hidden APIs.\"",
}
droidstubs {
@@ -1706,10 +1706,9 @@ droidstubs {
args: metalava_framework_docs_args +
" --show-unannotated " +
" --show-annotation android.annotation.SystemApi " +
" --show-annotation android.annotation.TestApi "
" --show-annotation android.annotation.TestApi ",
}
droidstubs {
name: "hiddenapi-mappings",
defaults: ["metalava-api-stubs-default"],
@@ -1728,7 +1727,7 @@ droidstubs {
" --hide UnhiddenSystemApi " +
" --show-unannotated " +
" --show-annotation android.annotation.SystemApi " +
" --show-annotation android.annotation.TestApi "
" --show-annotation android.annotation.TestApi ",
}
filegroup {
@@ -1852,5 +1851,5 @@ filegroup {
aidl_mapping {
name: "framework-aidl-mappings",
srcs: [":framework-defaults"],
output: "framework-aidl-mappings.txt"
output: "framework-aidl-mappings.txt",
}