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

Commit fc3e3056 authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

Clean up framework-statsd 

- Include framework aidl sources where needed.
- Don't use core_platform as sdk_version. Use current or system_current
or core_current temporarily until module_current is ready
- Use android_module_lib_stubs_current where applicable.
- remove visibility to wifi
- Remove framework-all dependency

Bug: 146209659
Bug: 146167933
Test: m
Test: fastboot flashall
Test: m framework-statsd-stubs-systemapi
Test: m framework-statsd-stubs-publicapi
Test: m framework-statsd-stubs-module_libs_api
Change-Id: I80c793cb9a51a2e3b07c2a679c5342c91dc493d4
parent 6c0f623a

apex/statsd/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
// limitations under the License.

//

filegroup {

    name: "statsd_java_aidl",

    name: "framework-statsd-aidl-sources",

    srcs: ["**/*.aidl"],

}

apex/statsd/framework/Android.bp

+48 −25
Original line number Diff line number Diff line
@@ -31,35 +31,56 @@ filegroup { 
    name: "framework-statsd-sources",

    srcs: [

        "java/**/*.java",

        ":statsd_java_aidl",

        ":framework-statsd-aidl-sources",

        ":statslog-statsd-java-gen",

    ],

}



java_defaults {

    name: "framework-statsd-defaults",



    // TODO(b/146757305): Use "module_current" once it's ready.

    sdk_version: "core_current",



    libs: [

        "framework-annotations-lib",



        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current" or "module_current"

        "android_module_lib_stubs_current",

    ],

}



java_library {

    name: "framework-statsd",

    defaults: [

        "framework-statsd-defaults",

    ],

    installable: true,

    // TODO(b/146209659): Use system_current instead.

    sdk_version: "core_platform",



    srcs: [

        ":framework-statsd-sources",

    ],



    aidl: {

        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current" or "module_current"

        include_dirs: [

            // To refer:

            // android.app.PendintIntent

            "frameworks/base/core/java",

        ],

    },



    permitted_packages: [

        "android.app",

        "android.os",

        "android.util",

    ],

    libs: [

        "framework-annotations-lib",

        // TODO(b/146230220): Use android_module_lib_stubs_current instead.

        //"android_module_lib_stubs_current",

        "framework-all",

    ],



    hostdex: true, // for hiddenapi check

    visibility: [

        "//frameworks/base/apex/statsd:__subpackages__",

        //TODO(b/146167933) remove this

        "//frameworks/opt/net/wifi/service",

    ],

    apex_available: [

        "com.android.os.statsd",
@@ -69,13 +90,14 @@ java_library { 


stubs_defaults {

    name: "framework-statsd-stubs-srcs-defaults",

    srcs: [ ":framework-statsd-sources" ],

    srcs: [

        ":framework-statsd-sources",

    ],



    libs: [

        // TODO(b/148218250): Change to android_system_stubs_current

        "framework-all",

        "framework-annotations-lib",

    ],

    sdk_version: "core_platform",

    sdk_version: "system_current",

}



droidstubs {
@@ -92,6 +114,7 @@ droidstubs { 
        "framework-module-stubs-defaults-systemapi",

        "framework-statsd-stubs-srcs-defaults",

    ],



}



droidstubs {
@@ -112,24 +135,24 @@ droidstubs { 


java_library {

    name: "framework-statsd-stubs-publicapi",

    defaults: [

        "framework-statsd-defaults",

    ],

    srcs: [ ":framework-statsd-stubs-srcs-publicapi" ],

    // TODO(b/148218250): Change to current

    libs: [ "framework-all" ],

    sdk_version: "core_platform",

}



java_library {

    name: "framework-statsd-stubs-systemapi",

    defaults: [

        "framework-statsd-defaults",

    ],

    srcs: [ ":framework-statsd-stubs-srcs-systemapi" ],

    // TODO(b/148218250): Change to system_current

    libs: [ "framework-all" ],

    sdk_version: "core_platform",

}



java_library {

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

    srcs: [ ":framework-statsd-stubs-srcs-systemapi" ],

    // TODO(b/148218250): Change to system_current

    libs: [ "framework-all" ],

    sdk_version: "core_platform",

    defaults: [

        "framework-statsd-defaults",

    ],

    srcs: [ ":framework-statsd-stubs-srcs-module_libs_api" ],

}

apex/statsd/service/Android.bp

+10 −5
Original line number Diff line number Diff line
@@ -16,16 +16,21 @@ java_library { 
    srcs: [

        ":service-statsd-sources",

    ],

    // TODO(b/146209659): Use system_current instead once framework-statsd compiles against

    // system_current.



    // TODO(b/146757305) should be "module_current" since not allowed to use

    // @CorePlatformApi's

    sdk_version: "core_platform",



    libs: [

        "framework-annotations-lib",

        "framework-statsd",

        // TODO(b/146758669): Remove this line after nullability annotations are system APIs.

        "android_system_stubs_current",

        "services-stubs",

        "framework-statsd",



        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current" or "module_current"

        "android_module_lib_stubs_current",

    ],



    apex_available: [

        "com.android.os.statsd",

        "test_com.android.os.statsd",