diff options
| -rw-r--r-- | AconfigFlags.bp | 1 | ||||
| -rw-r--r-- | apex/jobscheduler/service/Android.bp | 6 | ||||
| -rw-r--r-- | apex/jobscheduler/service/aconfig/Android.bp | 15 | ||||
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/tests/mockingservicestests/Android.bp | 1 | ||||
| -rw-r--r-- | services/tests/powerservicetests/Android.bp | 1 |
6 files changed, 20 insertions, 5 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 9f4667e8517b..a1f77e3355fa 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -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}", diff --git a/apex/jobscheduler/service/Android.bp b/apex/jobscheduler/service/Android.bp index e817d5c6220c..6c83add3b8e3 100644 --- a/apex/jobscheduler/service/Android.bp +++ b/apex/jobscheduler/service/Android.bp @@ -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", ], diff --git a/apex/jobscheduler/service/aconfig/Android.bp b/apex/jobscheduler/service/aconfig/Android.bp index 3f4ab50eb390..7d8a363ba819 100644 --- a/apex/jobscheduler/service/aconfig/Android.bp +++ b/apex/jobscheduler/service/aconfig/Android.bp @@ -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__"], +} diff --git a/services/core/Android.bp b/services/core/Android.bp index fbe8e8007907..4e49c6e4e7de 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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"], diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 45cf66d43a73..063af573e1f3 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -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", diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp index 82ac4c6ad3f8..8d455fedf9b2 100644 --- a/services/tests/powerservicetests/Android.bp +++ b/services/tests/powerservicetests/Android.bp @@ -15,7 +15,6 @@ android_test { "frameworks-base-testutils", "platform-compat-test-rules", "platform-test-annotations", - "service-jobscheduler-deviceidle.flags-aconfig-java", "services.core", "servicestests-utils", "testables", |