Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70b70a7 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6f407f38de4393a040d92c7073e8d4bacd400fd9
parents d99881fb 82cd5382

Android.bp

+5 −7
Original line number Diff line number Diff line
@@ -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",
@@ -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 {