diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp index 55239868da78..149b22355c58 100644 --- a/Android.bp +++ b/Android.bp @@ -25,18 +25,6 @@ // // READ ME: ######################################################## -// TODO(b/21090328): Remove filter after we are ready to. -soong_config_module_type { - name: "java_library_with_nonpublic_deps", - module_type: "java_library", - config_namespace: "ANDROID", - bool_variables: ["include_nonpublic_framework_api"], - properties: [ - "static_libs", - "libs", - ], -} - package { default_applicable_licenses: ["frameworks_base_license"], } @@ -109,6 +97,7 @@ filegroup { ":platform-compat-native-aidl", // AIDL sources from external directories + ":android.hardware.gnss-V2-java-source", ":android.hardware.graphics.common-V3-java-source", ":android.hardware.security.keymint-V2-java-source", ":android.hardware.security.secureclock-V1-java-source", @@ -151,7 +140,7 @@ filegroup { ], } -java_library_with_nonpublic_deps { +java_library { name: "framework-all", installable: false, static_libs: [ @@ -285,7 +274,7 @@ java_defaults { "frameworks/native/libs/permission/aidl", // TODO: remove when moved to the below package "frameworks/base/packages/ConnectivityT/framework-t/aidl-export", - "packages/modules/Bluetooth/system/binder", + "packages/modules/Bluetooth/framework/aidl-export", "packages/modules/Connectivity/framework/aidl-export", "packages/modules/Media/apex/aidl/stable", "hardware/interfaces/graphics/common/aidl", @@ -340,6 +329,7 @@ java_defaults { "modules-utils-preconditions", "modules-utils-synchronous-result-receiver", "modules-utils-os", + "modules-utils-uieventlogger-interface", "framework-permission-aidl-java", "spatializer-aidl-java", "audiopolicy-types-aidl-java", @@ -543,7 +533,7 @@ stubs_defaults { "frameworks/native/libs/permission/aidl", // TODO: remove when moved to the below package "frameworks/base/packages/ConnectivityT/framework-t/aidl-export", - "packages/modules/Bluetooth/system/binder", + "packages/modules/Bluetooth/framework/aidl-export", "packages/modules/Connectivity/framework/aidl-export", "packages/modules/Media/apex/aidl/stable", "hardware/interfaces/graphics/common/aidl", @@ -583,7 +573,7 @@ stubs_defaults { name: "module-classpath-stubs-defaults", aidl: { include_dirs: [ - "packages/modules/Bluetooth/system/binder", + "packages/modules/Bluetooth/framework/aidl-export", "packages/modules/Connectivity/framework/aidl-export", "packages/modules/Media/apex/aidl/stable", ], |