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

Commit efba4176 authored by Kweku Adams's avatar Kweku Adams
Browse files

Avoid duplicate classes in boot path. 

Switch to using libs to avoid loading the same class into the
boot path multiple times.

Bug: 309674488
Test: atest android.compat.sjp.cts.StrictJavaPackagesTest
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest CtsJobSchedulerTestCases:JobSchedulingTest
Test: atest CtsOsTestCases:PowerManagerTest
Test: atest PowerServiceTests:PowerManagerServiceTest
Change-Id: I4a00922aec9ae295da4480784088d18d0c6bf806
parent 10614f64

AconfigFlags.bp

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 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

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

    installable: true,



    defaults: [

        "service-jobscheduler-aconfig-libraries",

    ],



    srcs: [

        "java/**/*.java",

        ":framework-jobscheduler-shared-srcs",
@@ -27,6 +23,8 @@ 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

+0 −15
Original line number Diff line number Diff line
@@ -29,18 +29,3 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 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

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

        "service-blobstore",

        "service-jobscheduler",

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

        "service-permission.impl",

        "service-sdksandbox.impl",

        "services.backup",