diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/Android.bp b/Android.bp index 3fff2d4c3919..d63cd4ef0614 100644 --- a/Android.bp +++ b/Android.bp @@ -327,7 +327,6 @@ java_defaults { "rs/java", "sax/java", "telecomm/java", - "wifi/aidl-export", ], }, } @@ -346,6 +345,7 @@ java_library { "android.hardware.cas-V1.1-java", "android.hardware.cas-V1.2-java", "android.hardware.contexthub-V1.0-java", + "android.hardware.contexthub-V1.1-java", "android.hardware.gnss-V1.0-java", "android.hardware.gnss-V2.1-java", "android.hardware.health-V1.0-java-constants", @@ -392,7 +392,7 @@ java_defaults { exclude_srcs: [ // See comment on framework-atb-backward-compatibility module below - "core/java/android/content/pm/parsing/library/AndroidTestBaseUpdater.java", + "core/java/android/content/pm/AndroidTestBaseUpdater.java", ], sdk_version: "core_platform", @@ -452,6 +452,18 @@ filegroup { path: "core/java", } +filegroup { + name: "libpowermanager_aidl", + srcs: [ + "core/java/android/os/Temperature.aidl", + "core/java/android/os/CoolingDevice.aidl", + "core/java/android/os/IThermalEventListener.aidl", + "core/java/android/os/IThermalStatusListener.aidl", + "core/java/android/os/IThermalService.aidl", + ], + path: "core/java", +} + java_library { name: "framework-minus-apex", defaults: ["framework-defaults"], @@ -462,7 +474,6 @@ java_library { "framework-statsd-stubs-module_libs_api", "framework-permission-stubs-systemapi", "framework-wifi-stubs", - "ike-stubs", "framework-tethering-stubs", ], installable: true, @@ -513,7 +524,6 @@ java_library { "framework-sdkextensions-stubs-systemapi", "framework-statsd-stubs-module_libs_api", "framework-wifi-stubs", - "ike-stubs", "framework-tethering-stubs", // TODO (b/147688669) should be framework-telephony-stubs "framework-telephony", @@ -596,7 +606,7 @@ java_library { installable: true, libs: ["app-compat-annotations"], srcs: [ - "core/java/android/content/pm/parsing/library/AndroidTestBaseUpdater.java", + "core/java/android/content/pm/AndroidTestBaseUpdater.java", ], } @@ -687,8 +697,10 @@ filegroup { srcs: [ "core/java/android/annotation/CallbackExecutor.java", "core/java/android/annotation/CheckResult.java", + "core/java/android/annotation/CurrentTimeMillisLong.java", "core/java/android/annotation/IntDef.java", "core/java/android/annotation/IntRange.java", + "core/java/android/annotation/LongDef.java", "core/java/android/annotation/NonNull.java", "core/java/android/annotation/Nullable.java", "core/java/android/annotation/RequiresPermission.java", @@ -1028,22 +1040,6 @@ aidl_interface { }, } - -subdirs = [ - "cmds/*", - "core/*", - "libs/*", - "media/*", - "proto", - "tools/*", - "native/android", - "native/graphics/jni", -] - -optional_subdirs = [ - "core/tests/utiltests/jni", -] - // TODO(b/77285514): remove this once the last few hidl interfaces have been // updated to use hwbinder.stubs. java_library { @@ -1103,13 +1099,6 @@ python_binary_host { } filegroup { - name: "framework-annotation-nonnull-srcs", - srcs: [ - "core/java/android/annotation/NonNull.java", - ], -} - -filegroup { name: "framework-media-annotation-srcs", srcs: [ ":framework-annotations", @@ -1126,7 +1115,6 @@ filegroup { srcs: [ ":framework-annotations", "core/java/android/annotation/BytesLong.java", - "core/java/android/annotation/CurrentTimeMillisLong.java", "core/java/android/annotation/CurrentTimeSecondsLong.java", "core/java/android/annotation/DurationMillisLong.java", ], @@ -1326,7 +1314,6 @@ java_library { libs: [ "framework-minus-apex", "unsupportedappusage", - "ike-stubs", ], static_libs: [ "libphonenumber-platform", |