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

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

Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ... 

* changes:
  Create a filegroup for public stub sources
  Minor refactorings in api.go
  Convert merged module lib stub to api.go
  Some minor tweaks for api.go
  Temporarily add support for conditional modules
  Construct sdk-annotations.zip programmatically
  Replace manual genrule modules with combined_apis
parents a312a961 4468d7c6

Android.bp

+0 −21
Original line number Diff line number Diff line
@@ -140,27 +140,6 @@ filegroup { 
    ],

}



java_library {

    name: "framework-updatable-stubs-module_libs_api",

    static_libs: [

        "android.net.ipsec.ike.stubs.module_lib",

        "framework-appsearch.stubs.module_lib",

        "framework-connectivity.stubs.module_lib",

        "framework-graphics.stubs.module_lib",

        "framework-media.stubs.module_lib",

        "framework-mediaprovider.stubs.module_lib",

        "framework-permission.stubs.module_lib",

        "framework-permission-s.stubs.module_lib",

        "framework-scheduling.stubs.module_lib",

        "framework-sdkextensions.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

    ],

    sdk_version: "module_current",

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

}



java_library {

    name: "framework-all",

    installable: false,

ApiDocs.bp

+5 −56
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ stubs_defaults { 
    srcs: [

        ":android-non-updatable-stub-sources",



        // Module sources

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":i18n.module.public.api{.public.stubs.source}",



        // No longer part of the stubs, but are included in the docs.

        ":android-test-base-sources",

        ":android-test-mock-sources",
@@ -116,6 +111,10 @@ stubs_defaults { 
    name: "framework-doc-stubs-sources-default",

    defaults: ["framework-doc-stubs-default"],

    srcs: [

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":i18n.module.public.api{.public.stubs.source}",



        ":framework-appsearch-sources",

        ":framework-connectivity-sources",

        ":framework-graphics-srcs",
@@ -156,22 +155,8 @@ droidstubs { 
droidstubs {

    name: "framework-doc-stubs",

    defaults: ["framework-doc-stubs-default"],

    srcs: [":all-modules-public-stubs-source"],

    args: metalava_framework_docs_args,

    srcs: [

        ":android.net.ipsec.ike{.public.stubs.source}",

        ":framework-appsearch{.public.stubs.source}",

        ":framework-connectivity{.public.stubs.source}",

        ":framework-graphics{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-permission{.public.stubs.source}",

        ":framework-permission-s{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",

    ],

    aidl: {

        local_include_dirs: [

            "apex/media/aidl/stable",
@@ -182,42 +167,6 @@ droidstubs { 
    },

}



// This produces the same annotations.zip as framework-doc-stubs, but by using

// outputs from individual modules instead of all the source code.

genrule {

    name: "sdk-annotations.zip",

    srcs: [

        ":android-non-updatable-doc-stubs{.annotations.zip}",



        // Conscrypt and i18n currently do not enable annotations

        // ":conscrypt.module.public.api{.public.annotations.zip}",

        // ":i18n.module.public.api{.public.annotations.zip}",



        // Modules that enable annotations below

        ":android.net.ipsec.ike{.public.annotations.zip}",

        ":art.module.public.api{.public.annotations.zip}",

        ":framework-appsearch{.public.annotations.zip}",

        ":framework-connectivity{.public.annotations.zip}",

        ":framework-graphics{.public.annotations.zip}",

        ":framework-media{.public.annotations.zip}",

        ":framework-mediaprovider{.public.annotations.zip}",

        ":framework-permission{.public.annotations.zip}",

        ":framework-permission-s{.public.annotations.zip}",

        ":framework-scheduling{.public.annotations.zip}",

        ":framework-sdkextensions{.public.annotations.zip}",

        ":framework-statsd{.public.annotations.zip}",

        ":framework-tethering{.public.annotations.zip}",

        ":framework-wifi{.public.annotations.zip}",

    ],

    out: ["annotations.zip"],

    tools: [

        "merge_annotation_zips",

        "soong_zip",

    ],

    cmd: "$(location merge_annotation_zips) $(genDir)/out $(in) && " +

        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",

}



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

// API docs are created from the generated stub source files

// using droiddoc

api/Android.bp

+24 −330
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ bootstrap_go_package { 
        "soong",

        "soong-android",

        "soong-genrule",

        "soong-java",

    ],

    srcs: ["api.go"],

    pluginFor: ["soong_build"],
@@ -102,43 +103,30 @@ genrule { 
    visibility: ["//visibility:public"],

}



genrule {

    name: "frameworks-base-api-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.public.api.txt}",

        ":art.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":framework-appsearch{.public.api.txt}",

        ":framework-connectivity{.public.api.txt}",

        ":framework-graphics{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",

        ":framework-permission{.public.api.txt}",

        ":framework-permission-s{.public.api.txt}",

        ":framework-scheduling{.public.api.txt}",

        ":framework-sdkextensions{.public.api.txt}",

        ":framework-statsd{.public.api.txt}",

        ":framework-tethering{.public.api.txt}",

        ":framework-wifi{.public.api.txt}",

        ":i18n.module.public.api{.public.api.txt}",

        ":non-updatable-current.txt",

    ],

    out: ["current.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "current.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/public/api",

            dest: "android.txt",

        },

combined_apis {

    name: "frameworks-base-api",

    bootclasspath: [

        "android.net.ipsec.ike",

        "art.module.public.api",

        "conscrypt.module.public.api",

        "framework-appsearch",

        "framework-connectivity",

        "framework-graphics",

        "framework-media",

        "framework-mediaprovider",

        "framework-permission",

        "framework-permission-s",

        "framework-scheduling",

        "framework-sdkextensions",

        "framework-statsd",

        "framework-tethering",

        "framework-wifi",

        "i18n.module.public.api",

    ],

    system_server_classpath: [

        "service-media-s",

        "service-permission",

    ],

    visibility: ["//visibility:public"],

}



genrule {
@@ -157,108 +145,6 @@ genrule { 
        "$(location :frameworks-base-api-current.txt)",

}



genrule {

    name: "frameworks-base-api-current.srcjar",

    srcs: [

        ":android.net.ipsec.ike{.public.stubs.source}",

        ":api-stubs-docs-non-updatable",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":framework-appsearch{.public.stubs.source}",

        ":framework-connectivity{.public.stubs.source}",

        ":framework-graphics{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-permission{.public.stubs.source}",

        ":framework-permission-s{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",

        ":framework-sdkextensions{.public.stubs.source}",

        ":framework-statsd{.public.stubs.source}",

        ":framework-tethering{.public.stubs.source}",

        ":framework-wifi{.public.stubs.source}",

        ":i18n.module.public.api{.public.stubs.source}",

    ],

    out: ["current.srcjar"],

    tools: ["merge_zips"],

    cmd: "$(location merge_zips) $(out) $(in)",

    visibility: ["//visibility:private"], // Used by make module in //development, mind.

}



genrule {

    name: "frameworks-base-api-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.public.removed-api.txt}",

        ":art.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-appsearch{.public.removed-api.txt}",

        ":framework-connectivity{.public.removed-api.txt}",

        ":framework-graphics{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

        ":framework-permission{.public.removed-api.txt}",

        ":framework-permission-s{.public.removed-api.txt}",

        ":framework-scheduling{.public.removed-api.txt}",

        ":framework-sdkextensions{.public.removed-api.txt}",

        ":framework-statsd{.public.removed-api.txt}",

        ":framework-tethering{.public.removed-api.txt}",

        ":framework-wifi{.public.removed-api.txt}",

        ":i18n.module.public.api{.public.removed-api.txt}",

        ":non-updatable-removed.txt",

    ],

    out: ["removed.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "removed.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/public/api",

            dest: "removed.txt",

        },

    ],

}



genrule {

    name: "frameworks-base-api-system-current.txt",

    srcs: [

        ":art.module.public.api{.system.api.txt}",

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",

        ":framework-graphics{.system.api.txt}",

        ":framework-media{.system.api.txt}",

        ":framework-mediaprovider{.system.api.txt}",

        ":framework-permission{.system.api.txt}",

        ":framework-permission-s{.system.api.txt}",

        ":framework-scheduling{.system.api.txt}",

        ":framework-sdkextensions{.system.api.txt}",

        ":framework-statsd{.system.api.txt}",

        ":framework-tethering{.system.api.txt}",

        ":framework-wifi{.system.api.txt}",

        ":non-updatable-system-current.txt",

    ],

    out: ["system-current.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-current.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system/api",

            dest: "android.txt",

        },

    ],

    visibility: ["//visibility:public"],

}



genrule {

    name: "frameworks-base-api-system-current-compat",

    srcs: [
@@ -277,79 +163,6 @@ genrule { 
        "$(location :frameworks-base-api-system-current.txt)",

}



genrule {

    name: "frameworks-base-api-system-removed.txt",

    srcs: [

        ":art.module.public.api{.system.removed-api.txt}",

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",

        ":framework-graphics{.system.removed-api.txt}",

        ":framework-media{.system.removed-api.txt}",

        ":framework-mediaprovider{.system.removed-api.txt}",

        ":framework-permission{.system.removed-api.txt}",

        ":framework-permission-s{.system.removed-api.txt}",

        ":framework-scheduling{.system.removed-api.txt}",

        ":framework-sdkextensions{.system.removed-api.txt}",

        ":framework-statsd{.system.removed-api.txt}",

        ":framework-tethering{.system.removed-api.txt}",

        ":framework-wifi{.system.removed-api.txt}",

        ":non-updatable-system-removed.txt",

    ],

    out: ["system-removed.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-removed.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system/api",

            dest: "removed.txt",

        },

    ],

    visibility: ["//visibility:public"],

}



genrule {

    name: "frameworks-base-api-module-lib-current.txt",

    srcs: [

        ":art.module.public.api{.module-lib.api.txt}",

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",

        ":framework-graphics{.module-lib.api.txt}",

        ":framework-media{.module-lib.api.txt}",

        ":framework-mediaprovider{.module-lib.api.txt}",

        ":framework-permission{.module-lib.api.txt}",

        ":framework-permission-s{.module-lib.api.txt}",

        ":framework-scheduling{.module-lib.api.txt}",

        ":framework-sdkextensions{.module-lib.api.txt}",

        ":framework-statsd{.module-lib.api.txt}",

        ":framework-tethering{.module-lib.api.txt}",

        ":framework-wifi{.module-lib.api.txt}",

        ":non-updatable-module-lib-current.txt",

    ],

    out: ["module-lib-current.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "module-lib-current.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/module-lib/api",

            dest: "android.txt",

        },

    ],

}



genrule {

    name: "frameworks-base-api-module-lib-current-compat",

    srcs: [
@@ -371,42 +184,6 @@ genrule { 
        "$(location :frameworks-base-api-module-lib-current.txt)",

}



genrule {

    name: "frameworks-base-api-module-lib-removed.txt",

    srcs: [

        ":art.module.public.api{.module-lib.removed-api.txt}",

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",

        ":framework-graphics{.module-lib.removed-api.txt}",

        ":framework-media{.module-lib.removed-api.txt}",

        ":framework-mediaprovider{.module-lib.removed-api.txt}",

        ":framework-permission{.module-lib.removed-api.txt}",

        ":framework-permission-s{.module-lib.removed-api.txt}",

        ":framework-scheduling{.module-lib.removed-api.txt}",

        ":framework-sdkextensions{.module-lib.removed-api.txt}",

        ":framework-statsd{.module-lib.removed-api.txt}",

        ":framework-tethering{.module-lib.removed-api.txt}",

        ":framework-wifi{.module-lib.removed-api.txt}",

        ":non-updatable-module-lib-removed.txt",

    ],

    out: ["module-lib-removed.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "module-lib-removed.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/module-lib/api",

            dest: "removed.txt",

        },

    ],

}



genrule {

    name: "combined-removed-dex",

    visibility: [
@@ -423,86 +200,3 @@ genrule { 
    out: ["combined-removed-dex.txt"],

    cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",

}
 


genrule {

    name: "frameworks-base-api-system-server-current.txt",

    srcs: [

        ":service-media-s{.system-server.api.txt}",

        ":service-permission{.system-server.api.txt}",

        ":non-updatable-system-server-current.txt",

    ],

    out: ["system-server-current.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-server-current.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "android.txt",

        },

    ],

}



genrule {

    name: "frameworks-base-api-system-server-removed.txt",

    srcs: [

        ":service-media-s{.system-server.removed-api.txt}",

        ":service-permission{.system-server.removed-api.txt}",

        ":non-updatable-system-server-removed.txt",

    ],

    out: ["system-server-removed.txt"],

    tools: ["metalava"],

    cmd: metalava_cmd + "$(in) --api $(out)",

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-server-removed.txt",

        },

        {

            targets: ["sdk"],

            dir: "apistubs/android/system-server/api",

            dest: "removed.txt",

        },

    ],

}



// This rule will filter classes present in the jar files of mainline modules

// from the lint database in api-versions.xml.

// This is done to reduce the number of false positive NewApi findings in

// java libraries that compile against the module SDK

genrule {

    name: "api-versions-xml-public-filtered",

    srcs: [

        // Note: order matters: first parameter is the full api-versions.xml

        // after that the stubs files in any order

        // stubs files are all modules that export API surfaces EXCEPT ART

        ":framework-doc-stubs{.api_versions.xml}",

        ":android.net.ipsec.ike.stubs{.jar}",

        ":conscrypt.module.public.api.stubs{.jar}",

        ":framework-appsearch.stubs{.jar}",

        ":framework-connectivity.stubs{.jar}",

        ":framework-graphics.stubs{.jar}",

        ":framework-media.stubs{.jar}",

        ":framework-mediaprovider.stubs{.jar}",

        ":framework-permission.stubs{.jar}",

        ":framework-permission-s.stubs{.jar}",

        ":framework-scheduling.stubs{.jar}",

        ":framework-sdkextensions.stubs{.jar}",

        ":framework-statsd.stubs{.jar}",

        ":framework-tethering.stubs{.jar}",

        ":framework-wifi.stubs{.jar}",

        ":i18n.module.public.api.stubs{.jar}",

    ],

    out: ["api-versions-public-filtered.xml"],

    tools: ["api_versions_trimmer"],

    cmd: "$(location api_versions_trimmer) $(out) $(in)",

    dist: {

        targets: ["sdk"],

    },

}

api/api.go

+115 −36

File changed.

Preview size limit exceeded, changes collapsed.