Merge "Remove jobscheduler-framework"

Android.bp

@@ -194,13 +194,14 @@ filegroup {
         ":framework-core-sources",
         ":framework-drm-sources",
         ":framework-graphics-sources",
+        ":framework-jobscheduler-sources", // jobscheduler is not a module for R
         ":framework-keystore-sources",
         ":framework-location-sources",
         ":framework-lowpan-sources",
-        ":framework-media-sources",
         ":framework-mca-effect-sources",
         ":framework-mca-filterfw-sources",
         ":framework-mca-filterpacks-sources",
+        ":framework-media-sources",
         ":framework-mime-sources",
         ":framework-mms-sources",
         ":framework-opengl-sources",
@@ -410,7 +411,6 @@ java_library {
     installable: true,
     static_libs: [
         "framework-minus-apex",
-        "jobscheduler-framework",
     ],
     required: [
         "framework-platform-compat-config",
@@ -965,7 +965,6 @@ stubs_defaults {
         ":updatable-media-srcs",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
-        ":jobscheduler-framework-source",
     ],
     libs: framework_docs_only_libs,
     local_sourcepaths: frameworks_base_subdirs,
@@ -1028,7 +1027,6 @@ stubs_defaults {
         ":core-current-stubs-source",
         ":core_public_api_files",
         ":updatable-media-srcs",
-        ":jobscheduler-framework-source",
     ],
     libs: ["framework-internal-utils"],
     local_sourcepaths: frameworks_base_subdirs,

apex/jobscheduler/framework/Android.bp

@@ -1,5 +1,5 @@
 filegroup {
-    name: "jobscheduler-framework-source",
+    name: "framework-jobscheduler-sources",
     srcs: [
         "java/**/*.java",
         "java/android/app/job/IJobCallback.aidl",
@@ -12,13 +12,12 @@ filegroup {
 
 java_library {
     name: "jobscheduler-framework",
-    installable: true,
+    installable: false,
+    compile_dex: true,
     sdk_version: "core_platform",
-
     srcs: [
-        ":jobscheduler-framework-source",
+        ":framework-jobscheduler-sources",
     ],
-
     aidl: {
         export_include_dirs: [
             "java",