diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 52 |
1 files changed, 13 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp index d6f15669e8a8..4fd129d1009c 100644 --- a/Android.bp +++ b/Android.bp @@ -65,7 +65,7 @@ filegroup { } filegroup { - name: "framework-graphics-sources", + name: "framework-graphics-nonupdatable-sources", srcs: [ "graphics/java/**/*.java", "graphics/java/**/*.aidl", @@ -223,7 +223,7 @@ filegroup { ":framework-blobstore-sources", ":framework-core-sources", ":framework-drm-sources", - ":framework-graphics-sources", + ":framework-graphics-nonupdatable-sources", ":framework-jobscheduler-sources", // jobscheduler is not a module for R ":framework-keystore-sources", ":framework-identity-sources", @@ -282,6 +282,8 @@ filegroup { filegroup { name: "framework-updatable-sources", srcs: [ + ":framework-appsearch-sources", + ":framework-graphics-srcs", ":framework-mediaprovider-sources", ":framework-permission-sources", ":framework-sdkextensions-sources", @@ -295,6 +297,8 @@ filegroup { java_library { name: "framework-updatable-stubs-module_libs_api", static_libs: [ + "framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one. + "framework-graphics-stubs-module_libs_api", "framework-media-stubs-module_libs_api", "framework-mediaprovider-stubs-module_libs_api", "framework-permission-stubs-module_libs_api", @@ -474,6 +478,7 @@ filegroup { "core/java/android/os/IThermalEventListener.aidl", "core/java/android/os/IThermalStatusListener.aidl", "core/java/android/os/IThermalService.aidl", + "core/java/android/os/IPowerManager.aidl", ], path: "core/java", } @@ -502,6 +507,7 @@ java_library { visibility: [ "//frameworks/base", // TODO(b/147128803) remove the below lines + "//frameworks/base/apex/appsearch/framework", "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", "//frameworks/base/packages/Tethering/tests/unit", @@ -524,6 +530,8 @@ java_library { static_libs: [ "app-compat-annotations", "framework-minus-apex", + // TODO(b/146218515): should be removed + "framework-appsearch", "framework-updatable-stubs-module_libs_api", ], sdk_version: "core_platform", @@ -542,6 +550,7 @@ java_library { // Additional dependencies needed to build the ike API classes. "ike-internals", ], + libs: ["icing-java-proto-lite"], apex_available: ["//apex_available:platform"], visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST @@ -552,8 +561,8 @@ java_library { } platform_compat_config { - name: "framework-platform-compat-config", - src: ":framework-minus-apex", + name: "framework-platform-compat-config", + src: ":framework-minus-apex", } // A temporary build target that is conditionally included on the bootclasspath if @@ -1285,41 +1294,6 @@ java_library { sdk_version: "module_current", } -java_library { - name: "framework-telephony", - srcs: [ - //":framework-telephony-sources", - //":framework-telephony-shared-srcs", - ], - // TODO: change to framework-system-stub to build against system APIs. - libs: [ - "framework-minus-apex", - "unsupportedappusage", - ], - static_libs: [ - "libphonenumber-platform", - "app-compat-annotations", - ], - sdk_version: "core_platform", - aidl: { - export_include_dirs: ["telephony/java"], - include_dirs: [ - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - ] - }, - jarjar_rules: ":framework-telephony-jarjar-rules", - dxflags: [ - "--core-library", - "--multi-dex", - ], - // This is to break the dependency from boot jars. - dex_preopt: { - enabled: false, - }, - installable: true, -} - filegroup { // TODO (b/147690217): move to frameworks/base/telephony/common. name: "framework-telephony-annotations", |