summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-03-23 11:17:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-23 11:17:06 +0000
commit82cd5382b7b971036e4028051a1bb4305cea5c2b (patch)
tree7fa3459ef5ca562a37c2e5b1452b2b18c4089fb3 /Android.bp
parent9327a5787665f4eb1e74b7e6b72c8337c6cac935 (diff)
parentc130918e2537e7a578e09b72348e736fe37e1933 (diff)
Merge "Remove unnecessary dependency on libcore-platform-compat-config"
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp12
1 files changed, 5 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index c9ed7ede26ba..470932378383 100644
--- a/Android.bp
+++ b/Android.bp
@@ -306,8 +306,8 @@ filegroup {
genrule {
name: "statslog-telephony-common-java-gen",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common"
- + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
+ cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +
+ " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],
}
@@ -607,7 +607,6 @@ java_library {
// TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
"gps_debug.conf",
"icu4j-platform-compat-config",
- "libcore-platform-compat-config",
"protolog.conf.json.gz",
"services-platform-compat-config",
"documents-ui-compat-config",
@@ -687,7 +686,7 @@ genrule {
name: "statslog-framework-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module framework" +
- " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",
+ " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",
out: ["com/android/internal/util/FrameworkStatsLog.java"],
}
@@ -788,7 +787,7 @@ filegroup {
java_library {
name: "framework-annotations-lib",
- srcs: [ ":framework-annotations" ],
+ srcs: [":framework-annotations"],
sdk_version: "core_current",
}
@@ -1015,7 +1014,6 @@ cc_library {
},
}
-
// This is the full proto version of libplatformprotos. It may only
// be used by test code that is not shipped on the device.
cc_library {
@@ -1176,7 +1174,7 @@ java_library {
"core/java/android/os/RemoteException.java",
"core/java/android/util/AndroidException.java",
],
- libs: [ "unsupportedappusage" ],
+ libs: ["unsupportedappusage"],
dxflags: ["--core-library"],
installable: false,