1 files changed, 6 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 26c00152c650..ee3b39681ea2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -279,6 +279,7 @@ java_defaults {
         "core/java/android/os/storage/IStorageShutdownObserver.aidl",
         "core/java/android/os/storage/IObbActionListener.aidl",
         "core/java/android/permission/IPermissionController.aidl",
+        "core/java/android/permission/IPermissionManager.aidl",
         ":keystore_aidl",
         "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl",
         "core/java/android/service/appprediction/IPredictionService.aidl",
@@ -421,6 +422,7 @@ java_defaults {
         "core/java/com/android/internal/appwidget/IAppWidgetHost.aidl",
         "core/java/com/android/internal/backup/IBackupTransport.aidl",
         "core/java/com/android/internal/backup/IObbBackupService.aidl",
+        "core/java/com/android/internal/infra/IAndroidFuture.aidl",
         "core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl",
         "core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl",
         "core/java/com/android/internal/inputmethod/IMultiClientInputMethod.aidl",
@@ -481,6 +483,10 @@ java_defaults {
         "media/java/android/media/IMediaHTTPConnection.aidl",
         "media/java/android/media/IMediaHTTPService.aidl",
         "media/java/android/media/IMediaResourceMonitor.aidl",
+        "media/java/android/media/IMediaRoute2Provider.aidl",
+        "media/java/android/media/IMediaRoute2ProviderClient.aidl",
+        "media/java/android/media/IMediaRouter2Client.aidl",
+        "media/java/android/media/IMediaRouter2Manager.aidl",
         "media/java/android/media/IMediaRouterClient.aidl",
         "media/java/android/media/IMediaRouterService.aidl",
         "media/java/android/media/IMediaScannerListener.aidl",
@@ -1292,16 +1298,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",
@@ -1310,15 +1313,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",