LineageOS/android_packages_modules_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove @current modules from test data

Browse Source 
Bug: 232546567
Test: atest --host mainline_modules_sdks_test
      packages/modules/common/build/mainline_modules_sdks.sh
      # Compare before and after to make sure that they are
      # consistent.
Change-Id: I6efdcf47c74230381b0bdb40feee19bf2e06fb64
This commit is contained in:
Paul Duffin
2022-06-09 11:25:15 +00:00
parent 6f5c8d7afb
commit 57c56034d6
2 changed files with 0 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
View File

@@ -15,22 +15,6 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
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"],
hidden_api: {
stub_flags: "hiddenapi/stub-flags.csv",
annotation_flags: "hiddenapi/annotation-flags.csv",
metadata: "hiddenapi/metadata.csv",
index: "hiddenapi/index.csv",
all_flags: "hiddenapi/all-flags.csv",
},
}
module_prebuilt_bootclasspath_fragment { module_prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-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. // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -53,45 +37,6 @@ 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",
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",
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",
sdk_version: "module_current",
},
}
module_java_sdk_library_import { module_java_sdk_library_import {
name: "android.net.ipsec.ike", name: "android.net.ipsec.ike",
// 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 "module_build_from_source" in namespace "ANDROID" is true.
@@ -137,24 +82,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 { license {
name: "ipsec-module-sdk_Android-Apache-2.0", name: "ipsec-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"], visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"], 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"],
}

70
build/mainline_modules_sdks_test_data/ipsec_Android.bp.input
View File

@@ -6,22 +6,6 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
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"],
hidden_api: {
stub_flags: "hiddenapi/stub-flags.csv",
annotation_flags: "hiddenapi/annotation-flags.csv",
metadata: "hiddenapi/metadata.csv",
index: "hiddenapi/index.csv",
all_flags: "hiddenapi/all-flags.csv",
},
}
prebuilt_bootclasspath_fragment { prebuilt_bootclasspath_fragment {
name: "com.android.ipsec-bootclasspath-fragment", name: "com.android.ipsec-bootclasspath-fragment",
prefer: false, prefer: false,
@@ -38,45 +22,6 @@ 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",
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",
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",
sdk_version: "module_current",
},
}
java_sdk_library_import { java_sdk_library_import {
name: "android.net.ipsec.ike", name: "android.net.ipsec.ike",
prefer: false, prefer: false,
@@ -116,24 +61,9 @@ 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 { license {
name: "ipsec-module-sdk_Android-Apache-2.0", name: "ipsec-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"], visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"], license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"], 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"],
}