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

Merge "bpfmt -w Android.bp" into sc-dev

Browse Source
This commit is contained in:
Ilya Matyukhin
2021-05-18 20:06:32 +00:00
committed by Android (Google) Code Review
parent 25e82e7b59 6e146aa9ae
commit faf3969c2c
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/core/Android.bp
View File

@@ -21,7 +21,7 @@ filegroup {
name: "services.core-sources", name: "services.core-sources",
srcs: ["java/**/*.java"], srcs: ["java/**/*.java"],
exclude_srcs: [ exclude_srcs: [
":services.core-sources-am-wm" ":services.core-sources-am-wm",
], ],
path: "java", path: "java",
visibility: [ visibility: [
@@ -38,13 +38,13 @@ genrule {
], ],
tools: ["protologtool"], tools: ["protologtool"],
cmd: "$(location protologtool) transform-protolog-calls " + cmd: "$(location protologtool) transform-protolog-calls " +
"--protolog-class com.android.internal.protolog.common.ProtoLog " + "--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--protolog-impl-class com.android.internal.protolog.ProtoLogImpl " + "--protolog-impl-class com.android.internal.protolog.ProtoLogImpl " +
"--protolog-cache-class 'com.android.server.wm.ProtoLogCache' " + "--protolog-cache-class 'com.android.server.wm.ProtoLogCache' " +
"--loggroups-class com.android.internal.protolog.ProtoLogGroup " + "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +
"--loggroups-jar $(location :protolog-groups) " + "--loggroups-jar $(location :protolog-groups) " +
"--output-srcjar $(out) " + "--output-srcjar $(out) " +
"$(locations :services.core-sources-am-wm)", "$(locations :services.core-sources-am-wm)",
out: ["services.core.protolog.srcjar"], out: ["services.core.protolog.srcjar"],
} }
@@ -56,11 +56,11 @@ genrule {
], ],
tools: ["protologtool"], tools: ["protologtool"],
cmd: "$(location protologtool) generate-viewer-config " + cmd: "$(location protologtool) generate-viewer-config " +
"--protolog-class com.android.internal.protolog.common.ProtoLog " + "--protolog-class com.android.internal.protolog.common.ProtoLog " +
"--loggroups-class com.android.internal.protolog.ProtoLogGroup " + "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +
"--loggroups-jar $(location :protolog-groups) " + "--loggroups-jar $(location :protolog-groups) " +
"--viewer-conf $(out) " + "--viewer-conf $(out) " +
"$(locations :services.core-sources-am-wm)", "$(locations :services.core-sources-am-wm)",
out: ["services.core.protolog.json"], out: ["services.core.protolog.json"],
} }
@@ -71,12 +71,12 @@ genrule {
":services.core.protolog.json", ":services.core.protolog.json",
], ],
cmd: "cp $(location :generate-protolog.json) $(out) && " + cmd: "cp $(location :generate-protolog.json) $(out) && " +
"{ ! (diff $(out) $(location :services.core.protolog.json) | grep -q '^<') || " + "{ ! (diff $(out) $(location :services.core.protolog.json) | grep -q '^<') || " +
"{ echo -e '\\n\\n################################################################\\n#\\n" + "{ echo -e '\\n\\n################################################################\\n#\\n" +
"# ERROR: ProtoLog viewer config is stale. To update it, run:\\n#\\n" + "# ERROR: ProtoLog viewer config is stale. To update it, run:\\n#\\n" +
"# cp $(location :generate-protolog.json) " + "# cp $(location :generate-protolog.json) " +
"$(location :services.core.protolog.json)\\n#\\n" + "$(location :services.core.protolog.json)\\n#\\n" +
"################################################################\\n\\n' >&2 && false; } }", "################################################################\\n\\n' >&2 && false; } }",
out: ["services.core.protolog.json"], out: ["services.core.protolog.json"],
} }
@@ -84,7 +84,7 @@ genrule {
name: "statslog-art-java-gen", name: "statslog-art-java-gen",
tools: ["stats-log-api-gen"], tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module art" + cmd: "$(location stats-log-api-gen) --java $(out) --module art" +
" --javaPackage com.android.internal.art --javaClass ArtStatsLog --worksource", " --javaPackage com.android.internal.art --javaClass ArtStatsLog --worksource",
out: ["com/android/internal/art/ArtStatsLog.java"], out: ["com/android/internal/art/ArtStatsLog.java"],
} }
@@ -185,7 +185,7 @@ java_library {
java_library_host { java_library_host {
name: "core_cts_test_resources", name: "core_cts_test_resources",
srcs: ["java/com/android/server/notification/SmallHash.java"] srcs: ["java/com/android/server/notification/SmallHash.java"],
} }
prebuilt_etc { prebuilt_etc {
@@ -209,7 +209,6 @@ prebuilt_etc {
filegroup { filegroup {
name: "services.core-sources-deviceconfig-interface", name: "services.core-sources-deviceconfig-interface",
srcs: [ srcs: [
"java/com/android/server/utils/DeviceConfigInterface.java" "java/com/android/server/utils/DeviceConfigInterface.java",
], ],
} }