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

Commit f16720fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove jobscheduler-framework"

parents 4d77a3e1 48cc3729

Android.bp

+2 −4
Original line number Original line Diff line number Diff line
@@ -194,13 +194,14 @@ filegroup { 
        ":framework-core-sources",

        ":framework-core-sources",

        ":framework-drm-sources",

        ":framework-drm-sources",

        ":framework-graphics-sources",

        ":framework-graphics-sources",

        ":framework-jobscheduler-sources", // jobscheduler is not a module for R

        ":framework-keystore-sources",

        ":framework-keystore-sources",

        ":framework-location-sources",

        ":framework-location-sources",

        ":framework-lowpan-sources",

        ":framework-lowpan-sources",

        ":framework-media-sources",

        ":framework-mca-effect-sources",

        ":framework-mca-effect-sources",

        ":framework-mca-filterfw-sources",

        ":framework-mca-filterfw-sources",

        ":framework-mca-filterpacks-sources",

        ":framework-mca-filterpacks-sources",

        ":framework-media-sources",

        ":framework-mime-sources",

        ":framework-mime-sources",

        ":framework-mms-sources",

        ":framework-mms-sources",

        ":framework-opengl-sources",

        ":framework-opengl-sources",
@@ -410,7 +411,6 @@ java_library { 
    installable: true,

    installable: true,

    static_libs: [

    static_libs: [

        "framework-minus-apex",

        "framework-minus-apex",

        "jobscheduler-framework",

    ],

    ],

    required: [

    required: [

        "framework-platform-compat-config",

        "framework-platform-compat-config",
@@ -965,7 +965,6 @@ stubs_defaults { 
        ":updatable-media-srcs",

        ":updatable-media-srcs",

        "test-mock/src/**/*.java",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

        "test-runner/src/**/*.java",

        ":jobscheduler-framework-source",

    ],

    ],

    libs: framework_docs_only_libs,

    libs: framework_docs_only_libs,

    local_sourcepaths: frameworks_base_subdirs,

    local_sourcepaths: frameworks_base_subdirs,
@@ -1028,7 +1027,6 @@ stubs_defaults { 
        ":core-current-stubs-source",

        ":core-current-stubs-source",

        ":core_public_api_files",

        ":core_public_api_files",

        ":updatable-media-srcs",

        ":updatable-media-srcs",

        ":jobscheduler-framework-source",

    ],

    ],

    libs: ["framework-internal-utils"],

    libs: ["framework-internal-utils"],

    local_sourcepaths: frameworks_base_subdirs,

    local_sourcepaths: frameworks_base_subdirs,

apex/jobscheduler/framework/Android.bp

+4 −5
Original line number Original line Diff line number Diff line 
filegroup {

filegroup {

    name: "jobscheduler-framework-source",

    name: "framework-jobscheduler-sources",

    srcs: [

    srcs: [

        "java/**/*.java",

        "java/**/*.java",

        "java/android/app/job/IJobCallback.aidl",

        "java/android/app/job/IJobCallback.aidl",
@@ -12,13 +12,12 @@ filegroup { 




java_library {

java_library {

    name: "jobscheduler-framework",

    name: "jobscheduler-framework",

    installable: true,

    installable: false,

    compile_dex: true,

    sdk_version: "core_platform",

    sdk_version: "core_platform",



    srcs: [

    srcs: [

        ":jobscheduler-framework-source",

        ":framework-jobscheduler-sources",

    ],

    ],



    aidl: {

    aidl: {

        export_include_dirs: [

        export_include_dirs: [

            "java",

            "java",