1 files changed, 23 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp
index 8520d408b04d..35c7b1bc6fdd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -234,6 +234,11 @@ java_defaults {
             "wifi/java",
         ],
     },
+
+    required: [
+        // TODO: remove gps_debug when the build system propagates "required" properly.
+        "gps_debug.conf",
+    ],
 }
 
 // Collection of classes that are generated from non-Java files that are not listed in
@@ -307,17 +312,15 @@ java_defaults {
 
     static_libs: ["framework-internal-utils"],
 
-    required: [
-        // TODO: remove gps_debug when the build system propagates "required" properly.
-        "gps_debug.conf",
-    ],
-
     dxflags: [
         "--core-library",
         "--multi-dex",
     ],
 
-    plugins: ["view-inspector-annotation-processor"],
+    plugins: [
+        "view-inspector-annotation-processor",
+        "staledataclass-annotation-processor",
+    ],
 }
 
 filegroup {
@@ -354,14 +357,25 @@ filegroup {
 }
 
 java_library {
-    name: "framework",
+    name: "framework-minus-apex",
     defaults: ["framework-defaults"],
     javac_shard_size: 150,
+}
+
+java_library {
+    name: "framework",
+    defaults: ["framework-aidl-export-defaults"],
+    installable: true,
+    static_libs: [
+        "framework-minus-apex",
+        "jobscheduler-framework",
+    ],
     required: [
         "framework-platform-compat-config",
         "libcore-platform-compat-config",
         "services-platform-compat-config",
     ],
+    sdk_version: "core_platform",
 }
 
 java_library {
@@ -488,7 +502,6 @@ java_library {
     sdk_version: "core_platform",
     static_libs: [
         "libphonenumber-platform",
-        "nist-sip",
         "tagsoup",
         "rappor",
         "libtextclassifier-java",
@@ -822,16 +835,13 @@ framework_docs_only_libs = [
     "android-support-compat",
     "android-support-core-ui",
     "android-support-core-utils",
-    "android-support-customtabs",
     "android-support-design",
     "android-support-dynamic-animation",
     "android-support-exifinterface",
     "android-support-fragment",
     "android-support-media-compat",
     "android-support-percent",
-    "android-support-recommendation",
     "android-support-transition",
-    "android-support-tv-provider",
     "android-support-v7-cardview",
     "android-support-v7-gridlayout",
     "android-support-v7-mediarouter",
@@ -840,15 +850,10 @@ framework_docs_only_libs = [
     "android-support-v13",
     "android-support-v14-preference",
     "android-support-v17-leanback",
-    "android-support-v17-preference-leanback",
-    "android-support-wear",
     "android-support-vectordrawable",
     "android-support-animatedvectordrawable",
     "android-support-v7-appcompat",
     "android-support-v7-recyclerview",
-    "android-support-emoji",
-    "android-support-emoji-appcompat",
-    "android-support-emoji-bundled",
     "android-support-v8-renderscript",
     "android-support-multidex",
     "android-support-multidex-instrumentation",
@@ -890,6 +895,7 @@ 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,
@@ -951,6 +957,7 @@ stubs_defaults {
         ":opt-net-voip-srcs",
         ":core_public_api_files",
         ":updatable-media-srcs",
+        ":jobscheduler-framework-source",
     ],
     libs: ["framework-internal-utils"],
     local_sourcepaths: frameworks_base_subdirs,