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

Commit a5d0d86b authored by David Brazdil's avatar David Brazdil
Browse files

resolve merge conflicts of 4d213e58 to pi-dev-plus-aosp 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I9dc9a1e81d9a4d82823e15d1af0cc814a1005174
parents e323532e 4d213e58

Android.bp

+20 −1
Original line number Diff line number Diff line
@@ -1038,8 +1038,8 @@ droiddoc { 
        "api/current.txt",

    ],

    api_filename: "public_api.txt",

    private_api_filename: "private.txt",

    removed_api_filename: "removed.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: framework_docs_args + " -referenceonly -nodocs",

}
@@ -1108,6 +1108,25 @@ java_library_static { 
    ],

}



droiddoc {

    name: "hiddenapi-lists",

    defaults: ["framework-docs-default"],

    arg_files: [

        "core/res/AndroidManifest.xml",

        ":api-version-xml",

        "core/java/overview.html",

        ":current-support-api",

    ],

    private_dex_api_filename: "private-dex.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: framework_docs_args +

          " -referenceonly" +

          " -nodocs" +

          " -showUnannotated" +

          " -showAnnotation android.annotation.SystemApi" +

          " -showAnnotation android.annotation.TestApi",

}



filegroup {

    name: "apache-http-stubs-sources",

    srcs: [