From 880a5920be38e338c3657412037e8c86a3d08c16 Mon Sep 17 00:00:00 2001 From: satayev Date: Fri, 19 Aug 2022 09:59:52 +0000 Subject: Drop prebuilt files to android source tree. snapshot-creation-build-number.txt Android.bp LICENSE android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike.srcjar android.net.ipsec.ike-removed.txt android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike.srcjar android.net.ipsec.ike-removed.txt android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike.srcjar android.net.ipsec.ike-removed.txt android.net.ipsec.ike-stubs.jar metadata.csv signature-patterns.csv filtered-stub-flags.csv filtered-flags.csv index.csv annotation-flags.csv Built here: ab/T1004614 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 238423099 Change-Id: I18963eb364851b48f6db96aca6faf8c86cde291a Merged-In: I18963eb364851b48f6db96aca6faf8c86cde291a --- .../prebuilt_info_current_current_zip.asciipb | 4 +- current/Android.bp | 109 ++------------------- current/hiddenapi/filtered-flags.csv | 5 +- current/hiddenapi/filtered-stub-flags.csv | 5 +- current/hiddenapi/index.csv | 42 ++++---- .../android.net.ipsec.ike_annotations.zip | Bin 2941 -> 2950 bytes .../public/android.net.ipsec.ike-stubs.jar | Bin 46266 -> 46264 bytes .../public/android.net.ipsec.ike.srcjar | Bin 54109 -> 54221 bytes .../system/android.net.ipsec.ike_annotations.zip | Bin 2941 -> 2950 bytes current/snapshot-creation-build-number.txt | 2 +- 10 files changed, 38 insertions(+), 129 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index a17838a..15e559b 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: "T1004275" + build_id: "T1004614" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/IPsec" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_UNZIP transform_options { } diff --git a/current/Android.bp b/current/Android.bp index deb6067..e78608f 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -1,14 +1,5 @@ // 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_sdk_library_import", - "module_prebuilt_bootclasspath_fragment", - ], -} - package { // A default list here prevents the license LSC from adding its own list which would // be unnecessary as every module in the sdk already has its own licenses property. @@ -16,40 +7,11 @@ package { } prebuilt_bootclasspath_fragment { - name: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current", - sdk_member_name: "com.android.ipsec-bootclasspath-fragment", - visibility: ["//visibility:public"], - apex_available: ["com.android.ipsec"], - licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], - contents: ["ipsec-module-sdk_android.net.ipsec.ike@current"], - fragments: [ - { - apex: "com.android.art", - module: "art-bootclasspath-fragment", - }, - { - apex: "com.android.tethering", - module: "com.android.tethering-bootclasspath-fragment", - }, - ], - hidden_api: { - annotation_flags: "hiddenapi/annotation-flags.csv", - metadata: "hiddenapi/metadata.csv", - index: "hiddenapi/index.csv", - signature_patterns: "hiddenapi/signature-patterns.csv", - filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", - filtered_flags: "hiddenapi/filtered-flags.csv", - }, -} - -module_prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, + use_source_config_var: { + config_namespace: "ANDROID", + var_name: "module_build_from_source", }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], @@ -76,55 +38,11 @@ module_prebuilt_bootclasspath_fragment { } java_sdk_library_import { - name: "ipsec-module-sdk_android.net.ipsec.ike@current", - sdk_member_name: "android.net.ipsec.ike", - visibility: ["//visibility:public"], - apex_available: [ - "com.android.ipsec", - "test_com.android.ipsec", - ], - licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], - shared_library: true, - compile_dex: true, - permitted_packages: [ - "com.android.internal.net", - "android.net.ipsec.ike", - "android.net.eap", - ], - public: { - jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/public/android.net.ipsec.ike.txt", - removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, - system: { - jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/system/android.net.ipsec.ike.txt", - removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, - module_lib: { - jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt", - removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, -} - -module_java_sdk_library_import { name: "android.net.ipsec.ike", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, + use_source_config_var: { + config_namespace: "ANDROID", + var_name: "module_build_from_source", }, visibility: ["//visibility:public"], apex_available: [ @@ -165,24 +83,9 @@ module_java_sdk_library_import { }, } -license { - name: "ipsec-module-sdk_Android-Apache-2.0@current", - sdk_member_name: "Android-Apache-2.0", - visibility: ["//visibility:private"], - license_kinds: ["SPDX-license-identifier-Apache-2.0"], - license_text: ["licenses/build/soong/licenses/LICENSE"], -} - license { name: "ipsec-module-sdk_Android-Apache-2.0", visibility: ["//visibility:private"], license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_text: ["licenses/build/soong/licenses/LICENSE"], } - -sdk_snapshot { - name: "ipsec-module-sdk@current", - visibility: ["//visibility:public"], - bootclasspath_fragments: ["ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current"], - java_sdk_libs: ["ipsec-module-sdk_android.net.ipsec.ike@current"], -} diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv index 56f19ff..8843eb0 100644 --- a/current/hiddenapi/filtered-flags.csv +++ b/current/hiddenapi/filtered-flags.csv @@ -484,8 +484,11 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv index 8a0efcb..e128c85 100644 --- a/current/hiddenapi/filtered-stub-flags.csv +++ b/current/hiddenapi/filtered-stub-flags.csv @@ -484,8 +484,11 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv index fc2ea5c..6edb40a 100644 --- a/current/hiddenapi/index.csv +++ b/current/hiddenapi/index.csv @@ -4,24 +4,24 @@ Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String;,framewor Lcom/android/internal/util/HexDump;->toHexString([BII)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,116,5,116,25, Lcom/android/internal/util/HexDump;->toHexString(I)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,138,5,138,25, Lcom/android/internal/util/HexDump;->hexStringToByteArray(Ljava/lang/String;)[B,frameworks/base/core/java/com/android/internal/util/HexDump.java,172,5,172,25, -Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/IState.java,71,5,71,25, -Lcom/android/internal/util/State;->()V,frameworks/base/core/java/com/android/internal/util/State.java,35,5,35,25, -Lcom/android/internal/util/State;->enter()V,frameworks/base/core/java/com/android/internal/util/State.java,42,5,42,25, -Lcom/android/internal/util/State;->exit()V,frameworks/base/core/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/base/core/java/com/android/internal/util/State.java,58,5,58,25, -Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/State.java,76,5,76,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, -Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, -Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, -Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, -Lcom/android/internal/util/StateMachine;->start()V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/IState.java,71,5,71,25, +Lcom/android/internal/util/State;->()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,35,5,35,25, +Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,42,5,42,25, +Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25, +Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, +Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, +Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, +Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, +Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip index 516231a..64096c4 100644 Binary files a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip differ diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar index 29b0ab3..5a347bc 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar and b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar differ diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar index 05323cd..eac8fd1 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike.srcjar and b/current/sdk_library/public/android.net.ipsec.ike.srcjar differ diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip index 516231a..64096c4 100644 Binary files a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip differ diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 086f8b2..08c739a 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8762336 \ No newline at end of file +8945221 \ No newline at end of file -- cgit v1.2.3 From 4078892d91c76e100855b100c3e50e9854f2ad98 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Tue, 23 Aug 2022 17:54:56 +0000 Subject: Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert "Drop prebuilt files to android source tree." Revert submission 19676048-b/238423099 Reason for revert: multiple presubmit test failures Reverted Changes: If1ea6bc02:Drop prebuilt files to android source tree. I00096529f:Drop prebuilt files to android source tree. Ic880a64de:Drop prebuilt files to android source tree. I73a0e21bd:Drop prebuilt files to android source tree. Ib05de9612:Drop prebuilt files to android source tree. Ib000b0311:Drop prebuilt files to android source tree. I207854b91:Drop prebuilt files to android source tree. Ib61981f79:Drop prebuilt files to android source tree. I2465ab127:Drop prebuilt files to android source tree. Ibdf3b6aa8:Drop prebuilt files to android source tree. I18963eb36:Drop prebuilt files to android source tree. Ic165aaee7:Drop prebuilt files to android source tree. Ieeda50a98:Drop prebuilt files to android source tree. Iafe52654d:Drop prebuilt files to android source tree. I752df74c3:Drop prebuilt files to android source tree. Ic5ffbe97e:Drop prebuilt files to android source tree. Ib591ad65e:Drop prebuilt files to android source tree. If1b95e486:Drop prebuilt files to android source tree. I781d35227:Drop prebuilt files to android source tree. I9fc25eaa8:Drop prebuilt files to android source tree. I60eab0969:Drop prebuilt files to android source tree. I12a25fa01:Drop prebuilt files to android source tree. I8a292d5c2:Drop prebuilt files to android source tree. I9d8758342:Drop prebuilt files to android source tree. I87b4c0be0:Drop prebuilt files to android source tree. I3c54aa2bb:Drop prebuilt files to android source tree. I04556a840:Drop prebuilt files to android source tree. If360766c3:Drop prebuilt files to android source tree. Ib8a142caa:Drop prebuilt files to android source tree. I4c3ff01d6:Drop prebuilt files to android source tree. I2b2c12405:Drop prebuilt files to android source tree. I4bb9fccb1:Drop prebuilt files to android source tree. Ifb921cfbe:Drop prebuilt files to android source tree. I2229734a3:Drop prebuilt files to android source tree. Iab486cbcb:Drop prebuilt files to android source tree. I5708756d3:Drop prebuilt files to android source tree. Ie131fdec8:Drop prebuilt files to android source tree. I3a75319fe:Drop prebuilt files to android source tree. I198f91e34:Drop prebuilt files to android source tree. I9f2d419f9:Drop prebuilt files to android source tree. I4b89e9c99:Drop prebuilt files to android source tree. I79e547f2b:Drop prebuilt files to android source tree. Ibc93421dc:Drop prebuilt files to android source tree. Ib6ed2bba2:Drop prebuilt files to android source tree. Change-Id: I41ecf088ae9c7a7504963d3f66eb7e514ba8c72d --- .../prebuilt_info_current_current_zip.asciipb | 4 +- current/Android.bp | 109 +++++++++++++++++++-- current/hiddenapi/filtered-flags.csv | 5 +- current/hiddenapi/filtered-stub-flags.csv | 5 +- current/hiddenapi/index.csv | 42 ++++---- .../android.net.ipsec.ike_annotations.zip | Bin 2950 -> 2941 bytes .../public/android.net.ipsec.ike-stubs.jar | Bin 46264 -> 46266 bytes .../public/android.net.ipsec.ike.srcjar | Bin 54221 -> 54109 bytes .../system/android.net.ipsec.ike_annotations.zip | Bin 2950 -> 2941 bytes current/snapshot-creation-build-number.txt | 2 +- 10 files changed, 129 insertions(+), 38 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 15e559b..a17838a 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: "T1004614" + build_id: "T1004275" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/IPsec" - git_branch: "master" + git_branch: "tm-dev" transform: TRANSFORM_UNZIP transform_options { } diff --git a/current/Android.bp b/current/Android.bp index e78608f..deb6067 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -1,5 +1,14 @@ // 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_sdk_library_import", + "module_prebuilt_bootclasspath_fragment", + ], +} + package { // A default list here prevents the license LSC from adding its own list which would // be unnecessary as every module in the sdk already has its own licenses property. @@ -7,11 +16,40 @@ package { } prebuilt_bootclasspath_fragment { + name: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current", + sdk_member_name: "com.android.ipsec-bootclasspath-fragment", + visibility: ["//visibility:public"], + apex_available: ["com.android.ipsec"], + licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], + contents: ["ipsec-module-sdk_android.net.ipsec.ike@current"], + fragments: [ + { + apex: "com.android.art", + module: "art-bootclasspath-fragment", + }, + { + apex: "com.android.tethering", + module: "com.android.tethering-bootclasspath-fragment", + }, + ], + hidden_api: { + annotation_flags: "hiddenapi/annotation-flags.csv", + metadata: "hiddenapi/metadata.csv", + index: "hiddenapi/index.csv", + signature_patterns: "hiddenapi/signature-patterns.csv", + filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", + filtered_flags: "hiddenapi/filtered-flags.csv", + }, +} + +module_prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + prefer: true, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], @@ -38,11 +76,55 @@ prebuilt_bootclasspath_fragment { } java_sdk_library_import { + name: "ipsec-module-sdk_android.net.ipsec.ike@current", + sdk_member_name: "android.net.ipsec.ike", + visibility: ["//visibility:public"], + apex_available: [ + "com.android.ipsec", + "test_com.android.ipsec", + ], + licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], + shared_library: true, + compile_dex: true, + permitted_packages: [ + "com.android.internal.net", + "android.net.ipsec.ike", + "android.net.eap", + ], + public: { + jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"], + stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"], + current_api: "sdk_library/public/android.net.ipsec.ike.txt", + removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt", + annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip", + sdk_version: "module_current", + }, + system: { + jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"], + stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"], + current_api: "sdk_library/system/android.net.ipsec.ike.txt", + removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt", + annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip", + sdk_version: "module_current", + }, + module_lib: { + jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"], + current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt", + removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt", + annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip", + sdk_version: "module_current", + }, +} + +module_java_sdk_library_import { name: "android.net.ipsec.ike", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - use_source_config_var: { - config_namespace: "ANDROID", - var_name: "module_build_from_source", + prefer: true, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, }, visibility: ["//visibility:public"], apex_available: [ @@ -83,9 +165,24 @@ java_sdk_library_import { }, } +license { + name: "ipsec-module-sdk_Android-Apache-2.0@current", + sdk_member_name: "Android-Apache-2.0", + visibility: ["//visibility:private"], + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["licenses/build/soong/licenses/LICENSE"], +} + license { name: "ipsec-module-sdk_Android-Apache-2.0", visibility: ["//visibility:private"], license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_text: ["licenses/build/soong/licenses/LICENSE"], } + +sdk_snapshot { + name: "ipsec-module-sdk@current", + visibility: ["//visibility:public"], + bootclasspath_fragments: ["ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current"], + java_sdk_libs: ["ipsec-module-sdk_android.net.ipsec.ike@current"], +} diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv index 8843eb0..56f19ff 100644 --- a/current/hiddenapi/filtered-flags.csv +++ b/current/hiddenapi/filtered-flags.csv @@ -484,11 +484,8 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv index e128c85..8a0efcb 100644 --- a/current/hiddenapi/filtered-stub-flags.csv +++ b/current/hiddenapi/filtered-stub-flags.csv @@ -484,11 +484,8 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv index 6edb40a..fc2ea5c 100644 --- a/current/hiddenapi/index.csv +++ b/current/hiddenapi/index.csv @@ -4,24 +4,24 @@ Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String;,framewor Lcom/android/internal/util/HexDump;->toHexString([BII)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,116,5,116,25, Lcom/android/internal/util/HexDump;->toHexString(I)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,138,5,138,25, Lcom/android/internal/util/HexDump;->hexStringToByteArray(Ljava/lang/String;)[B,frameworks/base/core/java/com/android/internal/util/HexDump.java,172,5,172,25, -Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/IState.java,71,5,71,25, -Lcom/android/internal/util/State;->()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,35,5,35,25, -Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,42,5,42,25, -Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25, -Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, -Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, -Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, -Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, -Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/IState.java,71,5,71,25, +Lcom/android/internal/util/State;->()V,frameworks/base/core/java/com/android/internal/util/State.java,35,5,35,25, +Lcom/android/internal/util/State;->enter()V,frameworks/base/core/java/com/android/internal/util/State.java,42,5,42,25, +Lcom/android/internal/util/State;->exit()V,frameworks/base/core/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/base/core/java/com/android/internal/util/State.java,58,5,58,25, +Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/State.java,76,5,76,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, +Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, +Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, +Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, +Lcom/android/internal/util/StateMachine;->start()V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip index 64096c4..516231a 100644 Binary files a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip differ diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar index 5a347bc..29b0ab3 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar and b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar differ diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar index eac8fd1..05323cd 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike.srcjar and b/current/sdk_library/public/android.net.ipsec.ike.srcjar differ diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip index 64096c4..516231a 100644 Binary files a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip differ diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 08c739a..086f8b2 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8945221 \ No newline at end of file +8762336 \ No newline at end of file -- cgit v1.2.3 From 1dc3a76135a416b12628f31fbd1bf3a3b1054a35 Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Wed, 24 Aug 2022 09:23:20 +0000 Subject: Revert^2 "Drop prebuilt files to android source tree." 4078892d91c76e100855b100c3e50e9854f2ad98 Change-Id: I1eeae353daa8ef743660adf150aed769f2d457ef --- .../prebuilt_info_current_current_zip.asciipb | 4 +- current/Android.bp | 109 ++------------------- current/hiddenapi/filtered-flags.csv | 5 +- current/hiddenapi/filtered-stub-flags.csv | 5 +- current/hiddenapi/index.csv | 42 ++++---- .../android.net.ipsec.ike_annotations.zip | Bin 2941 -> 2950 bytes .../public/android.net.ipsec.ike-stubs.jar | Bin 46266 -> 46264 bytes .../public/android.net.ipsec.ike.srcjar | Bin 54109 -> 54221 bytes .../system/android.net.ipsec.ike_annotations.zip | Bin 2941 -> 2950 bytes current/snapshot-creation-build-number.txt | 2 +- 10 files changed, 38 insertions(+), 129 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index a17838a..15e559b 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: "T1004275" + build_id: "T1004614" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/IPsec" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_UNZIP transform_options { } diff --git a/current/Android.bp b/current/Android.bp index deb6067..e78608f 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -1,14 +1,5 @@ // 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_sdk_library_import", - "module_prebuilt_bootclasspath_fragment", - ], -} - package { // A default list here prevents the license LSC from adding its own list which would // be unnecessary as every module in the sdk already has its own licenses property. @@ -16,40 +7,11 @@ package { } prebuilt_bootclasspath_fragment { - name: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current", - sdk_member_name: "com.android.ipsec-bootclasspath-fragment", - visibility: ["//visibility:public"], - apex_available: ["com.android.ipsec"], - licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], - contents: ["ipsec-module-sdk_android.net.ipsec.ike@current"], - fragments: [ - { - apex: "com.android.art", - module: "art-bootclasspath-fragment", - }, - { - apex: "com.android.tethering", - module: "com.android.tethering-bootclasspath-fragment", - }, - ], - hidden_api: { - annotation_flags: "hiddenapi/annotation-flags.csv", - metadata: "hiddenapi/metadata.csv", - index: "hiddenapi/index.csv", - signature_patterns: "hiddenapi/signature-patterns.csv", - filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv", - filtered_flags: "hiddenapi/filtered-flags.csv", - }, -} - -module_prebuilt_bootclasspath_fragment { name: "com.android.ipsec-bootclasspath-fragment", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, + use_source_config_var: { + config_namespace: "ANDROID", + var_name: "module_build_from_source", }, visibility: ["//visibility:public"], apex_available: ["com.android.ipsec"], @@ -76,55 +38,11 @@ module_prebuilt_bootclasspath_fragment { } java_sdk_library_import { - name: "ipsec-module-sdk_android.net.ipsec.ike@current", - sdk_member_name: "android.net.ipsec.ike", - visibility: ["//visibility:public"], - apex_available: [ - "com.android.ipsec", - "test_com.android.ipsec", - ], - licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"], - shared_library: true, - compile_dex: true, - permitted_packages: [ - "com.android.internal.net", - "android.net.ipsec.ike", - "android.net.eap", - ], - public: { - jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/public/android.net.ipsec.ike.txt", - removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, - system: { - jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/system/android.net.ipsec.ike.txt", - removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, - module_lib: { - jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"], - stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"], - current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt", - removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt", - annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip", - sdk_version: "module_current", - }, -} - -module_java_sdk_library_import { name: "android.net.ipsec.ike", // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true. - prefer: true, - soong_config_variables: { - module_build_from_source: { - prefer: false, - }, + use_source_config_var: { + config_namespace: "ANDROID", + var_name: "module_build_from_source", }, visibility: ["//visibility:public"], apex_available: [ @@ -165,24 +83,9 @@ module_java_sdk_library_import { }, } -license { - name: "ipsec-module-sdk_Android-Apache-2.0@current", - sdk_member_name: "Android-Apache-2.0", - visibility: ["//visibility:private"], - license_kinds: ["SPDX-license-identifier-Apache-2.0"], - license_text: ["licenses/build/soong/licenses/LICENSE"], -} - license { name: "ipsec-module-sdk_Android-Apache-2.0", visibility: ["//visibility:private"], license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_text: ["licenses/build/soong/licenses/LICENSE"], } - -sdk_snapshot { - name: "ipsec-module-sdk@current", - visibility: ["//visibility:public"], - bootclasspath_fragments: ["ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current"], - java_sdk_libs: ["ipsec-module-sdk_android.net.ipsec.ike@current"], -} diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv index 56f19ff..8843eb0 100644 --- a/current/hiddenapi/filtered-flags.csv +++ b/current/hiddenapi/filtered-flags.csv @@ -484,8 +484,11 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv index 8a0efcb..e128c85 100644 --- a/current/hiddenapi/filtered-stub-flags.csv +++ b/current/hiddenapi/filtered-stub-flags.csv @@ -484,8 +484,11 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api -Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api +Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv index fc2ea5c..6edb40a 100644 --- a/current/hiddenapi/index.csv +++ b/current/hiddenapi/index.csv @@ -4,24 +4,24 @@ Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String;,framewor Lcom/android/internal/util/HexDump;->toHexString([BII)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,116,5,116,25, Lcom/android/internal/util/HexDump;->toHexString(I)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,138,5,138,25, Lcom/android/internal/util/HexDump;->hexStringToByteArray(Ljava/lang/String;)[B,frameworks/base/core/java/com/android/internal/util/HexDump.java,172,5,172,25, -Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/IState.java,71,5,71,25, -Lcom/android/internal/util/State;->()V,frameworks/base/core/java/com/android/internal/util/State.java,35,5,35,25, -Lcom/android/internal/util/State;->enter()V,frameworks/base/core/java/com/android/internal/util/State.java,42,5,42,25, -Lcom/android/internal/util/State;->exit()V,frameworks/base/core/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/base/core/java/com/android/internal/util/State.java,58,5,58,25, -Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/State.java,76,5,76,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, -Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, -Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, -Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, -Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, -Lcom/android/internal/util/StateMachine;->start()V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L -Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/IState.java,71,5,71,25, +Lcom/android/internal/util/State;->()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,35,5,35,25, +Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,42,5,42,25, +Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25, +Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25, +Lcom/android/internal/util/StateMachine;->(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25, +Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25, +Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25, +Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25, +Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L +Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip index 516231a..64096c4 100644 Binary files a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip differ diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar index 29b0ab3..5a347bc 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar and b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar differ diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar index 05323cd..eac8fd1 100644 Binary files a/current/sdk_library/public/android.net.ipsec.ike.srcjar and b/current/sdk_library/public/android.net.ipsec.ike.srcjar differ diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip index 516231a..64096c4 100644 Binary files a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip and b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip differ diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 086f8b2..08c739a 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8762336 \ No newline at end of file +8945221 \ No newline at end of file -- cgit v1.2.3 From d6c647a1f890a48eb0e8beabaf779435e32be5bc Mon Sep 17 00:00:00 2001 From: Bob Hanji Date: Wed, 31 Aug 2022 05:14:47 +0000 Subject: Drop prebuilt files to android source tree. Android.bp snapshot-creation-build-number.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt LICENSE filtered-flags.csv metadata.csv filtered-stub-flags.csv index.csv signature-patterns.csv annotation-flags.csv Built here: ab/T1004707 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 243632989 Change-Id: I38e769adf17f2d0f5aaf3a99f3825bc21985d91b --- .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 4 ++-- current/snapshot-creation-build-number.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 15e559b..d3ff31b 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: "T1004614" + build_id: "T1004707" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/IPsec" - git_branch: "master" + git_branch: "tm-qpr-dev" transform: TRANSFORM_UNZIP transform_options { } diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 08c739a..07baf93 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8945221 \ No newline at end of file +8981321 \ No newline at end of file -- cgit v1.2.3 From 627f2815b6d996093923593116f99c51eb1c361a Mon Sep 17 00:00:00 2001 From: Bob Hanji Date: Mon, 24 Oct 2022 10:22:27 +0000 Subject: Drop prebuilt files to android source tree. Android.bp snapshot-creation-build-number.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt android.net.ipsec.ike_annotations.zip android.net.ipsec.ike-removed.txt android.net.ipsec.ike.srcjar android.net.ipsec.ike-stubs.jar android.net.ipsec.ike.txt LICENSE filtered-flags.csv metadata.csv filtered-stub-flags.csv index.csv signature-patterns.csv annotation-flags.csv Built here: ab/T1005032 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 241324121 Change-Id: Id938ca374b31477af4364943fb6373d60f06b35d --- .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 2 +- current/snapshot-creation-build-number.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index d3ff31b..9eb6fd6 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: "T1004707" + build_id: "T1005032" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 07baf93..b8f9081 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8981321 \ No newline at end of file +9033554 \ No newline at end of file -- cgit v1.2.3 From 17915eea453953a63987653408b56e830b47966c Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Thu, 22 Dec 2022 20:28:03 +0000 Subject: Revert "Drop prebuilt files to android source tree." Revert submission 20271402-b6958f1c-2b9a-4faa-bf4e-b1c58372ad98 Reason for revert: Verified culprit for b/263438687. See http://b/263438687#comment4 for verification. Reverted changes: /q/submissionid:20271402-b6958f1c-2b9a-4faa-bf4e-b1c58372ad98 Change-Id: I10decf3359784406f8f2576566b6c3570e93dad4 --- .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 2 +- current/snapshot-creation-build-number.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 9eb6fd6..d3ff31b 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: "T1005032" + build_id: "T1004707" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index b8f9081..07baf93 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -9033554 \ No newline at end of file +8981321 \ No newline at end of file -- cgit v1.2.3