DO NOT MERGE Drop prebuilt files to android source tree. am: f842ac5d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/15619337
Change-Id: Ia817951af455099572480254c7fb5f843f8ea59f
diff --git a/current/Android.bp b/current/Android.bp
index efc6ae3..0e28b2d 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- ],
-}
-
prebuilt_bootclasspath_fragment {
name: "wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current",
sdk_member_name: "com.android.wifi-bootclasspath-fragment",
@@ -33,14 +25,9 @@
},
}
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
name: "com.android.wifi-bootclasspath-fragment",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: ["com.android.wifi"],
licenses: ["wifi-module-sdk_Android-Apache-2.0"],
@@ -95,14 +82,9 @@
},
}
-module_java_sdk_library_import {
+java_sdk_library_import {
name: "framework-wifi",
- prefer: true,
- soong_config_variables: {
- module_build_from_source: {
- prefer: false,
- },
- },
+ prefer: false,
visibility: ["//visibility:public"],
apex_available: [
"com.android.wifi",
