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

Commit 3b4319ea authored by Kweku Adams's avatar Kweku Adams
Browse files

Avoid duplicate classes in boot path. 

Switch to using static_libs in one location to avoid loading
the same class into the boot path multiple times.

Remove redundant links.

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 CtsAppTestCases
Test: atest CtsJobSchedulerTestCases:JobSchedulingTest
Test: atest CtsNotificationTestCases:NotificationManagerZenTest
Test: atest CtsNotificationTestCases:AutomaticZenRuleTest
Test: atest CtsOsTestCases:PowerManagerTest
Test: atest FrameworksUiServicesTests:ZenModeConfigTest
Test: atest PowerServiceTests:PowerManagerServiceTest
Change-Id: I917cc4ae662c55a030fbf266133fba04fec496f2
parent 71f14180

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

+1 −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",
@@ -32,6 +28,7 @@ java_library { 


    static_libs: [

        "modules-utils-fastxmlserializer",

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

    ],



    // Rename classes shared with the framework

apex/jobscheduler/service/aconfig/Android.bp

+0 −17
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ aconfig_declarations { 
java_aconfig_library {

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

    aconfig_declarations: "service-deviceidle.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

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

}
@@ -26,21 +25,5 @@ aconfig_declarations { 
java_aconfig_library {

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

    aconfig_declarations: "service-job.flags-aconfig",

    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 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ java_library_static { 
        "biometrics_flags_lib",

        "am_flags_lib",

        "com_android_wm_shell_flags_lib",

        "android.app.flags-aconfig-java"

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

    ],

    javac_shard_size: 50,

    javacflags: [