From 2ecfac0bb0899454ddf44c6ca50b35a8698681c1 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Wed, 15 Jun 2022 14:56:21 +0000 Subject: DO NOT MERGE Drop prebuilt files to android source tree. snapshot-creation-build-number.txt Android.bp framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar framework-wifi-removed.txt framework-wifi.srcjar framework-wifi_annotations.zip framework-wifi.txt framework-wifi-stubs.jar LICENSE index.csv hiddenapi-max-target-r-low-priority.txt filtered-stub-flags.csv hiddenapi-max-target-o-low-priority.txt annotation-flags.csv metadata.csv hiddenapi-unsupported.txt filtered-flags.csv signature-patterns.csv service-wifi.jar Built here: ab/T1004196 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 235705094 Change-Id: I0d63561d03594986e71d67599028f9b51414d542 --- .../prebuilt_info_current_current_zip.asciipb | 2 +- current/Android.bp | 67 +++++++++++++++------- current/snapshot-creation-build-number.txt | 2 +- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 39f602d..c0f2a47 100644 --- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb +++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "T1004135" + build_id: "T1004196" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip" } diff --git a/current/Android.bp b/current/Android.bp index c9d5a75..8d8a110 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -1,14 +1,39 @@ // This is auto-generated. DO NOT EDIT. -// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py. -soong_config_module_type_import { - from: "packages/modules/common/Android.bp", - module_types: [ - "module_java_import", - "module_java_sdk_library_import", - "module_prebuilt_bootclasspath_fragment", - "module_prebuilt_systemserverclasspath_fragment", - ], +// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py. +soong_config_module_type { + name: "wifi_prebuilt_java_import", + module_type: "java_import", + config_namespace: "wifi_module", + bool_variables: ["source_build"], + properties: ["prefer"], +} + +// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py. +soong_config_module_type { + name: "wifi_prebuilt_java_sdk_library_import", + module_type: "java_sdk_library_import", + config_namespace: "wifi_module", + bool_variables: ["source_build"], + properties: ["prefer"], +} + +// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py. +soong_config_module_type { + name: "wifi_prebuilt_prebuilt_bootclasspath_fragment", + module_type: "prebuilt_bootclasspath_fragment", + config_namespace: "wifi_module", + bool_variables: ["source_build"], + properties: ["prefer"], +} + +// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py. +soong_config_module_type { + name: "wifi_prebuilt_prebuilt_systemserverclasspath_fragment", + module_type: "prebuilt_systemserverclasspath_fragment", + config_namespace: "wifi_module", + bool_variables: ["source_build"], + properties: ["prefer"], } package { @@ -43,12 +68,12 @@ prebuilt_bootclasspath_fragment { }, } -module_prebuilt_bootclasspath_fragment { +wifi_prebuilt_prebuilt_bootclasspath_fragment { name: "com.android.wifi-bootclasspath-fragment", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, @@ -116,12 +141,12 @@ java_sdk_library_import { }, } -module_java_sdk_library_import { +wifi_prebuilt_java_sdk_library_import { name: "framework-wifi", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, @@ -181,12 +206,12 @@ java_import { jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar"], } -module_java_import { +wifi_prebuilt_java_import { name: "service-wifi", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, @@ -229,12 +254,12 @@ prebuilt_systemserverclasspath_fragment { standalone_contents: ["wifi-module-sdk_service-wifi@current"], } -module_prebuilt_systemserverclasspath_fragment { +wifi_prebuilt_prebuilt_systemserverclasspath_fragment { name: "com.android.wifi-systemserverclasspath-fragment", - // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. + // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true. prefer: true, soong_config_variables: { - module_build_from_source: { + source_build: { prefer: false, }, }, diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index a64f2fc..6e2e131 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8685210 \ No newline at end of file +8715879 \ No newline at end of file -- cgit v1.2.3