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

Commit c1d180cd authored by Andrei Onea's avatar Andrei Onea
Browse files

resolve merge conflicts of 04e04516 to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
parents 75b9b48c 04e04516

Android.bp

+8 −0
Original line number Original line Diff line number Diff line
@@ -1689,3 +1689,11 @@ filegroup { 
        "core/java/android/annotation/NonNull.java",

        "core/java/android/annotation/NonNull.java",

    ],

    ],

}

}



// Creates an index of AIDL methods; used for adding UnsupportedAppUsage

// annotations to private apis

aidl_mapping {

    name: "framework-aidl-mappings",

    srcs: [":framework-defaults"],

    output: "framework-aidl-mappings.txt"

}