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

Commit 94da08fb authored by Ikjoon Jang's avatar Ikjoon Jang Committed by Android (Google) Code Review
Browse files

Revert "Avoid duplicate classes in boot path." 

This reverts commit efba4176.

Reason for revert: DroidMonitor: Potential culprit for Bug b/310080905 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 310080905
Change-Id: Id7d6c1fbc6e58b08c14ad52b74a10adbff8abc4e
parent efba4176

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ aconfig_srcjars = [ 
    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",

    ":com.android.net.flags-aconfig-java{.generated_srcjars}",

    ":device_policy_aconfig_flags_lib{.generated_srcjars}",

    ":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",

    ":surfaceflinger_flags_java_lib{.generated_srcjars}",

    ":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",

apex/jobscheduler/service/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ java_library { 
    name: "service-jobscheduler",

    installable: true,



    defaults: [

        "service-jobscheduler-aconfig-libraries",

    ],



    srcs: [

        "java/**/*.java",

        ":framework-jobscheduler-shared-srcs",
@@ -23,8 +27,6 @@ java_library { 
        "app-compat-annotations",

        "framework",

        "services.core",

        "service-jobscheduler-deviceidle.flags-aconfig-java",

        "service-jobscheduler-job.flags-aconfig-java",

        "unsupportedappusage",

    ],

apex/jobscheduler/service/aconfig/Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -29,3 +29,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

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

}



service_jobscheduler_aconfig_srcjars = [

    ":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",

    ":service-jobscheduler-job.flags-aconfig-java{.generated_srcjars}",

]



// Aconfig declarations and libraries for the core framework

java_defaults {

    name: "service-jobscheduler-aconfig-libraries",

    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: service_jobscheduler_aconfig_srcjars,

    // Add aconfig-annotations-lib as a dependency for the optimization

    libs: ["aconfig-annotations-lib"],

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

}

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ java_library_static { 
        "service-rkp.stubs.system_server",

        "service-sdksandbox.stubs.system_server",

        "device_policy_aconfig_flags_lib",

        "service-jobscheduler-deviceidle.flags-aconfig-java",

    ],

    plugins: ["ImmutabilityAnnotationProcessor"],

services/tests/mockingservicestests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ android_test { 
        "platform-test-annotations",

        "service-blobstore",

        "service-jobscheduler",

        "service-jobscheduler-job.flags-aconfig-java",

        "service-permission.impl",

        "service-sdksandbox.impl",

        "services.backup",