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

Commit ced0bbd1 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge changes from topic "mvstub" 

* changes:
  Move ApiDocs.bp and StubLibraries.bp to api dir
  Ready more build rules for dir move
parents 15c4d00e 19fcec6c

Android.bp

+4 −9
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ filegroup { 
        "core/java/**/*.logtags",

        "**/package.html",

    ],

    visibility: ["//visibility:private"],

    visibility: ["//frameworks/base/api"],

}



// Defaults for all stubs that include the non-updatable framework. These defaults do not include
@@ -546,12 +546,10 @@ stubs_defaults { 
    java_version: "1.8",

    arg_files: [":frameworks-base-core-AndroidManifest.xml"],

    aidl: {

        local_include_dirs: [

            "media/aidl",

            "telephony/java",

        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/base/media/aidl",

            "frameworks/base/telephony/java",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",
@@ -583,7 +581,7 @@ stubs_defaults { 
    annotations_enabled: true,

    previous_api: ":android.api.public.latest",

    merge_annotations_dirs: ["metalava-manual"],

    defaults_visibility: ["//visibility:private"],

    defaults_visibility: ["//frameworks/base/api"],

    visibility: ["//frameworks/base/api"],

}
@@ -611,12 +609,9 @@ stubs_defaults { 
        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

    ],

    defaults_visibility: ["//visibility:private"],

}



build = [

    "StubLibraries.bp",

    "ApiDocs.bp",

    "ProtoLibraries.bp",

    "TestProtoLibraries.bp",

]

api/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -252,3 +252,8 @@ java_genrule { 
    out: ["api_fingerprint.txt"],

    cmd: "cat $(in) | md5sum | cut -d' ' -f1 > $(out)",

}



build = [

    "ApiDocs.bp",

    "StubLibraries.bp",

]

ApiDocs.bp→api/ApiDocs.bp

+5 −5
Original line number Diff line number Diff line
@@ -182,10 +182,10 @@ droidstubs { 
// using droiddoc

/////////////////////////////////////////////////////////////////////



framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +

framework_docs_only_args = " -android -manifest $(location :frameworks-base-core-AndroidManifest.xml) " +

    "-metalavaApiSince " +

    "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +

    "-overview $(location core/java/overview.html) " +

    "-overview $(location :frameworks-base-java-overview) " +

    // Federate Support Library references against local API file.

    "-federate SupportLib https://developer.android.com " +

    "-federationapi SupportLib $(location :current-support-api) " +
@@ -218,16 +218,16 @@ doc_defaults { 
        "sdk.preview 0",

    ],

    arg_files: [

        "core/res/AndroidManifest.xml",

        "core/java/overview.html",

        ":frameworks-base-core-AndroidManifest.xml",

        ":frameworks-base-java-overview",

        ":current-support-api",

        ":current-androidx-api",

    ],

    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/base/media/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

StubLibraries.bp→api/StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ droidstubs { 
    ],

    api_levels_sdk_type: "public",

    extensions_info_file: ":sdk-extensions-info",

    visibility: ["//frameworks/base"],

}



droidstubs {

api/docs

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../docs
 
 No newline at end of file