diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp index d64951c3d98f..cc754f21902a 100644 --- a/Android.bp +++ b/Android.bp @@ -62,12 +62,8 @@ license { "SPDX-license-identifier-Apache-2.0", "SPDX-license-identifier-BSD", "SPDX-license-identifier-CC-BY", - "SPDX-license-identifier-CPL-1.0", - "SPDX-license-identifier-GPL", - "SPDX-license-identifier-GPL-2.0", "SPDX-license-identifier-MIT", "SPDX-license-identifier-Unicode-DFS", - "SPDX-license-identifier-W3C", "legacy_unencumbered", ], license_text: [ @@ -81,6 +77,7 @@ filegroup { // Java/AIDL sources under frameworks/base ":framework-annotations", ":framework-blobstore-sources", + ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready ":framework-connectivity-tiramisu-sources", ":framework-core-sources", ":framework-drm-sources", @@ -93,7 +90,7 @@ filegroup { ":framework-mca-effect-sources", ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", - ":framework-media-sources", + ":framework-media-non-updatable-sources", ":framework-mms-sources", ":framework-omapi-sources", ":framework-opengl-sources", @@ -155,38 +152,6 @@ filegroup { } java_library_with_nonpublic_deps { - name: "framework-updatable-stubs-module_libs_api", - static_libs: [ - "android.net.ipsec.ike.stubs.module_lib", - "framework-appsearch.stubs.module_lib", - "framework-connectivity.stubs.module_lib", - "framework-connectivity-tiramisu.stubs.module_lib", - "framework-graphics.stubs.module_lib", - "framework-media.stubs.module_lib", - "framework-mediaprovider.stubs.module_lib", - "framework-permission.stubs.module_lib", - "framework-permission-s.stubs.module_lib", - "framework-scheduling.stubs.module_lib", - "framework-sdkextensions.stubs.module_lib", - "framework-statsd.stubs.module_lib", - "framework-supplementalprocess.stubs.module_lib", - "framework-tethering.stubs.module_lib", - "framework-uwb.stubs.module_lib", - "framework-nearby.stubs.module_lib", - "framework-wifi.stubs.module_lib", - ], - soong_config_variables: { - include_nonpublic_framework_api: { - static_libs: [ - "framework-supplementalapi.stubs.module_lib", - ], - }, - }, - sdk_version: "module_current", - visibility: ["//visibility:private"], -} - -java_library_with_nonpublic_deps { name: "framework-all", installable: false, static_libs: [ @@ -212,7 +177,7 @@ java_library_with_nonpublic_deps { soong_config_variables: { include_nonpublic_framework_api: { static_libs: [ - "framework-supplementalapi.stubs.module_lib", + "framework-supplementalapi.impl", ], }, }, @@ -466,7 +431,6 @@ filegroup { name: "framework-ike-shared-srcs", visibility: ["//packages/modules/IPsec"], srcs: [ - "core/java/android/net/annotations/PolicyDirection.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/WakeupMessage.java", "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", |