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

Commit 58b59a5e authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Copy @hide util files into framework-telephony. 

Also add jarjar rules for them.

Bug: 140908357
Test: build
Change-Id: I4411be058a002a4339ea563f444de9f4c0b67f23
parent 546ce5e4

Android.bp

+21 −4
Original line number Diff line number Diff line
@@ -1126,9 +1126,10 @@ genrule { 
}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process.

// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)

// and TeleService app (packages/services/Telephony).

filegroup {

    name: "framework-telephony-stack-shared-srcs",

    name: "framework-telephony-common-shared-srcs",

    srcs: [

        "core/java/android/os/BasicShellCommandHandler.java",

        "core/java/android/os/RegistrantList.java",
@@ -1150,6 +1151,21 @@ filegroup { 
    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process. This is used by framework-telephony (frameworks/base/telephony).

filegroup {

    name: "framework-telephony-shared-srcs",

    srcs: [

        "core/java/android/util/RecurrenceRule.java",

        "core/java/com/android/internal/os/SomeArgs.java",

        "core/java/com/android/internal/util/BitwiseInputStream.java",

        "core/java/com/android/internal/util/BitwiseOutputStream.java",

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/Preconditions.java",

    ],

}



// Avoid including Parcelable classes as we don't want to have two copies of

// Parcelable cross the process.

filegroup {
@@ -1272,6 +1288,7 @@ java_library { 
    name: "framework-telephony",

    srcs: [

        ":framework-telephony-sources",

        ":framework-telephony-shared-srcs",

    ],

    // TODO: change to framework-system-stub to build against system APIs.

    libs: [
@@ -1290,7 +1307,7 @@ java_library { 
            "frameworks/native/aidl/gui",

        ]

    },

    jarjar_rules: ":telephony-framework-jarjar-rules",

    jarjar_rules: ":framework-telephony-jarjar-rules",

    dxflags: [

        "--core-library",

        "--multi-dex",
@@ -1309,6 +1326,6 @@ filegroup { 
}



filegroup {

    name: "telephony-framework-jarjar-rules",

    name: "framework-telephony-jarjar-rules",

    srcs: ["telephony/framework-telephony-jarjar-rules.txt"],

}

telephony/framework-telephony-jarjar-rules.txt

+7 −2
Original line number Diff line number Diff line 
rule android.telephony.Annotation* android.telephony.framework.Annotation@1

rule android.util.RecurrenceRule* android.telephony.RecurrenceRule@1

rule com.android.i18n.phonenumbers.** com.android.telephony.framework.phonenumbers.@1

#TODO: add jarjar rules for statically linked util classes

rule com.android.internal.os.SomeArgs* android.telephony.SomeArgs@1

rule com.android.internal.util.BitwiseInputStream* android.telephony.BitwiseInputStream@1

rule com.android.internal.util.BitwiseOutputStream* android.telephony.BitwiseOutputStream@1

rule com.android.internal.util.Preconditions* android.telephony.Preconditions@1

rule com.android.internal.util.IndentingPrintWriter* android.telephony.IndentingPrintWriter@1

rule com.android.internal.util.HexDump* android.telephony.HexDump@1