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

Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382b7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646303

Change-Id: I6f407f38de4393a040d92c7073e8d4bacd400fd9
This commit is contained in:
Paul Duffin
2021-03-23 11:40:54 +00:00
committed by Automerger Merge Worker
parent d99881fb33 82cd5382b7
commit e70b70a77b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.bp
View File

@@ -306,8 +306,8 @@ filegroup {
genrule { genrule {
name: "statslog-telephony-common-java-gen", name: "statslog-telephony-common-java-gen",
tools: ["stats-log-api-gen"], tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +
+ " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog", " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"], 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. // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
"gps_debug.conf", "gps_debug.conf",
"icu4j-platform-compat-config", "icu4j-platform-compat-config",
"libcore-platform-compat-config",
"protolog.conf.json.gz", "protolog.conf.json.gz",
"services-platform-compat-config", "services-platform-compat-config",
"documents-ui-compat-config", "documents-ui-compat-config",
@@ -687,7 +686,7 @@ genrule {
name: "statslog-framework-java-gen", name: "statslog-framework-java-gen",
tools: ["stats-log-api-gen"], tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module framework" + 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"], out: ["com/android/internal/util/FrameworkStatsLog.java"],
} }
@@ -788,7 +787,7 @@ filegroup {
java_library { java_library {
name: "framework-annotations-lib", name: "framework-annotations-lib",
srcs: [ ":framework-annotations" ], srcs: [":framework-annotations"],
sdk_version: "core_current", sdk_version: "core_current",
} }
@@ -1015,7 +1014,6 @@ cc_library {
}, },
} }
// This is the full proto version of libplatformprotos. It may only // This is the full proto version of libplatformprotos. It may only
// be used by test code that is not shipped on the device. // be used by test code that is not shipped on the device.
cc_library { cc_library {
@@ -1176,7 +1174,7 @@ java_library {
"core/java/android/os/RemoteException.java", "core/java/android/os/RemoteException.java",
"core/java/android/util/AndroidException.java", "core/java/android/util/AndroidException.java",
], ],
libs: [ "unsupportedappusage" ], libs: ["unsupportedappusage"],
dxflags: ["--core-library"], dxflags: ["--core-library"],
installable: false, installable: false,