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

Commit bcf1be1c authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Use jarjar rules for framework.jar." am: b70a6cbf 

am: 43827552

Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a
parents 906f80cb 43827552

Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ java_defaults { 
        "ext",

    ],



    jarjar_rules: "jarjar_rules_hidl.txt",

    jarjar_rules: ":framework-jarjar-rules",



    static_libs: [

        "apex_aidl_interface-java",
@@ -726,6 +726,11 @@ java_defaults { 


}



filegroup {

    name: "framework-jarjar-rules",

    srcs: ["jarjar_rules_hidl.txt"],

}



filegroup {

    name: "libincident_aidl",

    srcs: [