Merge "Avoid duplicate classes in boot path." into main

6 files changed, 5 insertions, 20 deletions

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