Remove jobscheduler-framework
The jobscheduler won't be a module in R. Thus removing the java library
and appending its sources to framework-non-updatable-sources.
Bug: 139391334
Test: build
Change-Id: I1222ebe9e05963114eb5e969beb85926567c3033
diff --git a/Android.bp b/Android.bp
index 6b2fb0c..3b6eaa7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -194,13 +194,14 @@
":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 @@
installable: true,
static_libs: [
"framework-minus-apex",
- "jobscheduler-framework",
],
required: [
"framework-platform-compat-config",
@@ -965,7 +965,6 @@
":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 @@
":core-current-stubs-source",
":core_public_api_files",
":updatable-media-srcs",
- ":jobscheduler-framework-source",
],
libs: ["framework-internal-utils"],
local_sourcepaths: frameworks_base_subdirs,
diff --git a/apex/jobscheduler/framework/Android.bp b/apex/jobscheduler/framework/Android.bp
index 621ff9a..3902aa2 100644
--- a/apex/jobscheduler/framework/Android.bp
+++ b/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 @@
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",