Add mainline_modules_sdks to packages/modules/common/.
Change the list of modules to match AOSP list. Bug: 205100626 Test: atest mainline_modules_sdks_test Change-Id: I250c4aafcda5c3c1d636dac27ff5ffaa78b69b2a
This commit is contained in:
satayev
3
build/mainline_modules_sdks_test_data/OWNERS
Normal file
3
build/mainline_modules_sdks_test_data/OWNERS
Normal file
@@ -0,0 +1,3 @@
|
||||
hansson@google.com
|
||||
paulduffin@google.com
|
||||
satayev@google.com
|
||||
107
build/mainline_modules_sdks_test_data/art_Android.bp.expected
Normal file
107
build/mainline_modules_sdks_test_data/art_Android.bp.expected
Normal file
@@ -0,0 +1,107 @@
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
// Soong config variable stanza added by test_art.
|
||||
soong_config_module_type_import {
|
||||
from: "prebuilts/module_sdk/art/SoongConfig.bp",
|
||||
module_types: [
|
||||
"art_prebuilt_java_import",
|
||||
"art_prebuilt_prebuilt_bootclasspath_fragment",
|
||||
"art_prebuilt_prebuilt_platform_compat_config",
|
||||
],
|
||||
}
|
||||
|
||||
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.
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
art_prebuilt_prebuilt_bootclasspath_fragment {
|
||||
name: "art-bootclasspath-fragment",
|
||||
// Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
|
||||
prefer: true,
|
||||
soong_config_variables: {
|
||||
source_build: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/boot",
|
||||
"//art/build/sdk",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
apex_available: [
|
||||
"com.android.art",
|
||||
],
|
||||
licenses: ["art-module-sdk_art_license"],
|
||||
image_name: "art",
|
||||
contents: [
|
||||
"core-oj",
|
||||
"core-libart",
|
||||
"okhttp",
|
||||
"bouncycastle",
|
||||
"apache-xml",
|
||||
],
|
||||
api: {
|
||||
stub_libs: ["art.module.public.api"],
|
||||
},
|
||||
core_platform_api: {
|
||||
stub_libs: ["art.module.public.api.stubs.module_lib"],
|
||||
},
|
||||
hidden_api: {
|
||||
max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
|
||||
blocked: ["hiddenapi/hiddenapi-blocked.txt"],
|
||||
unsupported_packages: ["hiddenapi/hiddenapi-unsupported-packages.txt"],
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
art_prebuilt_prebuilt_platform_compat_config {
|
||||
name: "libcore-platform-compat-config",
|
||||
// Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
|
||||
prefer: true,
|
||||
soong_config_variables: {
|
||||
source_build: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/sdk",
|
||||
"//libcore",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
licenses: ["art-module-sdk_libcore_license"],
|
||||
metadata: "compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml",
|
||||
}
|
||||
|
||||
art_prebuilt_java_import {
|
||||
name: "core-oj",
|
||||
// Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true.
|
||||
prefer: true,
|
||||
soong_config_variables: {
|
||||
source_build: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/sdk",
|
||||
"//external/wycheproof",
|
||||
"//libcore",
|
||||
"//libcore/benchmarks",
|
||||
"//packages/modules/ArtPrebuilt",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
apex_available: [
|
||||
"com.android.art",
|
||||
"com.android.art.debug",
|
||||
],
|
||||
licenses: ["art-module-sdk_libcore_license"],
|
||||
jars: ["java/core-oj.jar"],
|
||||
}
|
||||
79
build/mainline_modules_sdks_test_data/art_Android.bp.input
Normal file
79
build/mainline_modules_sdks_test_data/art_Android.bp.input
Normal file
@@ -0,0 +1,79 @@
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
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.
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
prebuilt_bootclasspath_fragment {
|
||||
name: "art-bootclasspath-fragment",
|
||||
prefer: false,
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/boot",
|
||||
"//art/build/sdk",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
apex_available: [
|
||||
"com.android.art",
|
||||
],
|
||||
licenses: ["art-module-sdk_art_license"],
|
||||
image_name: "art",
|
||||
contents: [
|
||||
"core-oj",
|
||||
"core-libart",
|
||||
"okhttp",
|
||||
"bouncycastle",
|
||||
"apache-xml",
|
||||
],
|
||||
api: {
|
||||
stub_libs: ["art.module.public.api"],
|
||||
},
|
||||
core_platform_api: {
|
||||
stub_libs: ["art.module.public.api.stubs.module_lib"],
|
||||
},
|
||||
hidden_api: {
|
||||
max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
|
||||
blocked: ["hiddenapi/hiddenapi-blocked.txt"],
|
||||
unsupported_packages: ["hiddenapi/hiddenapi-unsupported-packages.txt"],
|
||||
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_platform_compat_config {
|
||||
name: "libcore-platform-compat-config",
|
||||
prefer: false,
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/sdk",
|
||||
"//libcore",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
licenses: ["art-module-sdk_libcore_license"],
|
||||
metadata: "compat_configs/libcore-platform-compat-config/libcore-platform-compat-config_meta.xml",
|
||||
}
|
||||
|
||||
java_import {
|
||||
name: "core-oj",
|
||||
prefer: false,
|
||||
visibility: [
|
||||
"//art/build/apex",
|
||||
"//art/build/sdk",
|
||||
"//external/wycheproof",
|
||||
"//libcore",
|
||||
"//libcore/benchmarks",
|
||||
"//packages/modules/ArtPrebuilt",
|
||||
"//prebuilts:__subpackages__",
|
||||
],
|
||||
apex_available: [
|
||||
"com.android.art",
|
||||
"com.android.art.debug",
|
||||
],
|
||||
licenses: ["art-module-sdk_libcore_license"],
|
||||
jars: ["java/core-oj.jar"],
|
||||
}
|
||||
160
build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
Normal file
160
build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
Normal file
@@ -0,0 +1,160 @@
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
// Soong config variable stanza added by test_common_mainline_module.
|
||||
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.
|
||||
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 {
|
||||
name: "com.android.ipsec-bootclasspath-fragment",
|
||||
// Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
|
||||
prefer: true,
|
||||
soong_config_variables: {
|
||||
module_build_from_source: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["com.android.ipsec"],
|
||||
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
|
||||
contents: ["android.net.ipsec.ike"],
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
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 {
|
||||
name: "android.net.ipsec.ike",
|
||||
// Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
|
||||
prefer: true,
|
||||
soong_config_variables: {
|
||||
module_build_from_source: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: [
|
||||
"com.android.ipsec",
|
||||
"test_com.android.ipsec",
|
||||
],
|
||||
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
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"],
|
||||
}
|
||||
139
build/mainline_modules_sdks_test_data/ipsec_Android.bp.input
Normal file
139
build/mainline_modules_sdks_test_data/ipsec_Android.bp.input
Normal file
@@ -0,0 +1,139 @@
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
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.
|
||||
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 {
|
||||
name: "com.android.ipsec-bootclasspath-fragment",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: ["com.android.ipsec"],
|
||||
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
|
||||
contents: ["android.net.ipsec.ike"],
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
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 {
|
||||
name: "android.net.ipsec.ike",
|
||||
prefer: false,
|
||||
visibility: ["//visibility:public"],
|
||||
apex_available: [
|
||||
"com.android.ipsec",
|
||||
"test_com.android.ipsec",
|
||||
],
|
||||
licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
|
||||
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",
|
||||
},
|
||||
}
|
||||
|
||||
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"],
|
||||
}
|
||||
Reference in New Issue
Block a user