Merge "Remove current versioned snapshot"
diff --git a/mainline/i18n/sdk/Android.bp b/mainline/i18n/sdk/Android.bp
index f82e316..3728b1f 100755
--- a/mainline/i18n/sdk/Android.bp
+++ b/mainline/i18n/sdk/Android.bp
@@ -7,29 +7,6 @@
}
prebuilt_bootclasspath_fragment {
- name: "i18n-module-sdk_i18n-bootclasspath-fragment@current",
- sdk_member_name: "i18n-bootclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-sdk_Android-Apache-2.0@current"],
- contents: ["i18n-module-sdk_core-icu4j@current"],
- api: {
- stub_libs: ["i18n-module-sdk_i18n.module.public.api@current"],
- },
- core_platform_api: {
- stub_libs: ["i18n-module-sdk_legacy.i18n.module.platform.api@current"],
- },
- hidden_api: {
- max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.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_bootclasspath_fragment {
name: "i18n-bootclasspath-fragment",
prefer: false,
visibility: ["//visibility:public"],
@@ -53,18 +30,6 @@
}
java_import {
- name: "i18n-module-sdk_core-icu4j@current",
- sdk_member_name: "core-icu4j",
- visibility: [
- "//external/icu/android_icu4j",
- "//packages/modules/RuntimeI18n/apex",
- ],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- jars: ["java/core-icu4j.jar"],
-}
-
-java_import {
name: "core-icu4j",
prefer: false,
visibility: [
@@ -77,46 +42,6 @@
}
java_sdk_library_import {
- name: "i18n-module-sdk_i18n.module.public.api@current",
- sdk_member_name: "i18n.module.public.api",
- visibility: [
- "//build/soong/java/core-libraries",
- "//external/icu/android_icu4j",
- "//frameworks/base",
- "//frameworks/base/api",
- "//packages/modules/RuntimeI18n/apex",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/i18n.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/i18n.module.public.api_stub_sources"],
- current_api: "sdk_library/public/i18n.module.public.api.txt",
- removed_api: "sdk_library/public/i18n.module.public.api-removed.txt",
- annotations: "sdk_library/public/i18n.module.public.api_annotations.zip",
- sdk_version: "none",
- },
- system: {
- jars: ["sdk_library/system/i18n.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/system/i18n.module.public.api_stub_sources"],
- current_api: "sdk_library/system/i18n.module.public.api.txt",
- removed_api: "sdk_library/system/i18n.module.public.api-removed.txt",
- annotations: "sdk_library/system/i18n.module.public.api_annotations.zip",
- sdk_version: "none",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/i18n.module.public.api-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/i18n.module.public.api_stub_sources"],
- current_api: "sdk_library/module-lib/i18n.module.public.api.txt",
- removed_api: "sdk_library/module-lib/i18n.module.public.api-removed.txt",
- annotations: "sdk_library/module-lib/i18n.module.public.api_annotations.zip",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
name: "i18n.module.public.api",
prefer: false,
visibility: [
@@ -157,27 +82,6 @@
}
java_sdk_library_import {
- name: "i18n-module-sdk_legacy.i18n.module.platform.api@current",
- sdk_member_name: "legacy.i18n.module.platform.api",
- visibility: [
- "//build/soong/java/core-libraries",
- "//external/icu/android_icu4j",
- "//packages/modules/RuntimeI18n/apex",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/legacy.i18n.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/legacy.i18n.module.platform.api_stub_sources"],
- current_api: "sdk_library/public/legacy.i18n.module.platform.api.txt",
- removed_api: "sdk_library/public/legacy.i18n.module.platform.api-removed.txt",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
name: "legacy.i18n.module.platform.api",
prefer: false,
visibility: [
@@ -199,27 +103,6 @@
}
java_sdk_library_import {
- name: "i18n-module-sdk_i18n.module.intra.core.api@current",
- sdk_member_name: "i18n.module.intra.core.api",
- visibility: [
- "//external/icu/android_icu4j",
- "//libcore:__subpackages__",
- "//packages/modules/RuntimeI18n/apex",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/i18n.module.intra.core.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/i18n.module.intra.core.api_stub_sources"],
- current_api: "sdk_library/public/i18n.module.intra.core.api.txt",
- removed_api: "sdk_library/public/i18n.module.intra.core.api-removed.txt",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
name: "i18n.module.intra.core.api",
prefer: false,
visibility: [
@@ -241,27 +124,6 @@
}
java_sdk_library_import {
- name: "i18n-module-sdk_stable.i18n.module.platform.api@current",
- sdk_member_name: "stable.i18n.module.platform.api",
- visibility: [
- "//build/soong/java/core-libraries",
- "//external/icu/android_icu4j",
- "//packages/modules/RuntimeI18n/apex",
- "//prebuilts:__subpackages__",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- shared_library: false,
- public: {
- jars: ["sdk_library/public/stable.i18n.module.platform.api-stubs.jar"],
- stub_srcs: ["sdk_library/public/stable.i18n.module.platform.api_stub_sources"],
- current_api: "sdk_library/public/stable.i18n.module.platform.api.txt",
- removed_api: "sdk_library/public/stable.i18n.module.platform.api-removed.txt",
- sdk_version: "none",
- },
-}
-
-java_sdk_library_import {
name: "stable.i18n.module.platform.api",
prefer: false,
visibility: [
@@ -283,14 +145,6 @@
}
license {
- name: "i18n-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: "i18n-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -298,23 +152,6 @@
}
license {
- name: "i18n-module-sdk_external_icu_license@current",
- sdk_member_name: "external_icu_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-EPL",
- "SPDX-license-identifier-ICU",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- "legacy_unencumbered",
- ],
- license_text: ["licenses/external/icu/NOTICE"],
-}
-
-license {
name: "i18n-module-sdk_external_icu_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -331,24 +168,6 @@
}
license {
- name: "i18n-module-sdk_external_icu_icu4c_license@current",
- sdk_member_name: "external_icu_icu4c_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-ICU",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/external/icu/icu4c/LICENSE",
- "licenses/external/icu/icu4c/license.html",
- ],
-}
-
-license {
name: "i18n-module-sdk_external_icu_icu4c_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -366,43 +185,6 @@
}
cc_prebuilt_library_headers {
- name: "i18n-module-sdk_libandroidicu_headers@current",
- sdk_member_name: "libandroidicu_headers",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- "com.android.i18n",
- ],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- host_supported: true,
- export_include_dirs: ["common_os/include/external/icu/libandroidicu/include"],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-cc_prebuilt_library_headers {
name: "libandroidicu_headers",
prefer: false,
visibility: ["//visibility:public"],
@@ -440,42 +222,6 @@
}
cc_prebuilt_library_headers {
- name: "i18n-module-sdk_libicuuc_headers@current",
- sdk_member_name: "libicuuc_headers",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-sdk_external_icu_icu4c_license@current"],
- host_supported: true,
- export_include_dirs: [
- "common_os/include/external/icu/icu4c/source/common",
- "common_os/include/external/icu/android_icu4c/include",
- ],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- },
-}
-
-cc_prebuilt_library_headers {
name: "libicuuc_headers",
prefer: false,
visibility: ["//visibility:public"],
@@ -512,65 +258,6 @@
}
cc_prebuilt_library_shared {
- name: "i18n-module-sdk_libandroidicu@current",
- sdk_member_name: "libandroidicu",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.i18n",
- ],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- host_supported: true,
- installable: false,
- unique_host_soname: true,
- export_include_dirs: ["common_os/include/external/icu/libandroidicu/include"],
- stubs: {
- versions: [
- "1",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libandroidicu.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libandroidicu.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libandroidicu.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libandroidicu.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libandroidicu-host.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libandroidicu-host.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libandroidicu-host.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libandroidicu",
prefer: false,
visibility: ["//visibility:public"],
@@ -629,61 +316,6 @@
}
cc_prebuilt_library_shared {
- name: "i18n-module-sdk_libicu@current",
- sdk_member_name: "libicu",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-sdk_external_icu_license@current"],
- host_supported: true,
- installable: false,
- export_include_dirs: ["common_os/include/external/icu/libicu/ndk_headers"],
- stubs: {
- versions: [
- "31",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libicu.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libicu.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libicu.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libicu.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libicu.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libicu.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libicu.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libicu",
prefer: false,
visibility: ["//visibility:public"],
@@ -736,44 +368,3 @@
},
},
}
-
-sdk_snapshot {
- name: "i18n-module-sdk@current",
- visibility: ["//visibility:public"],
- host_supported: true,
- native_header_libs: [
- "i18n-module-sdk_libandroidicu_headers@current",
- "i18n-module-sdk_libicuuc_headers@current",
- ],
- native_shared_libs: [
- "i18n-module-sdk_libandroidicu@current",
- "i18n-module-sdk_libicu@current",
- ],
- target: {
- android: {
- bootclasspath_fragments: ["i18n-module-sdk_i18n-bootclasspath-fragment@current"],
- java_boot_libs: ["i18n-module-sdk_core-icu4j@current"],
- java_sdk_libs: [
- "i18n-module-sdk_i18n.module.public.api@current",
- "i18n-module-sdk_legacy.i18n.module.platform.api@current",
- "i18n-module-sdk_i18n.module.intra.core.api@current",
- "i18n-module-sdk_stable.i18n.module.platform.api@current",
- ],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/mainline/i18n/test-exports/Android.bp b/mainline/i18n/test-exports/Android.bp
index 6ac1ecd..a374d6f 100755
--- a/mainline/i18n/test-exports/Android.bp
+++ b/mainline/i18n/test-exports/Android.bp
@@ -7,21 +7,6 @@
}
java_import {
- name: "i18n-module-test-exports_core-icu4j-for-host@current",
- sdk_member_name: "core-icu4j-for-host",
- visibility: [
- "//art/build",
- "//external/icu/android_icu4j",
- "//external/robolectric-shadows",
- "//frameworks/layoutlib",
- "//packages/modules/RuntimeI18n/apex",
- ],
- apex_available: ["//apex_available:platform"],
- licenses: ["i18n-module-test-exports_external_icu_license@current"],
- jars: ["java/core-icu4j-for-host.jar"],
-}
-
-java_import {
name: "core-icu4j-for-host",
prefer: false,
visibility: [
@@ -37,14 +22,6 @@
}
license {
- name: "i18n-module-test-exports_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: "i18n-module-test-exports_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -52,24 +29,6 @@
}
license {
- name: "i18n-module-test-exports_external_icu_icu4c_license@current",
- sdk_member_name: "external_icu_icu4c_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-ICU",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- "legacy_unencumbered",
- ],
- license_text: [
- "licenses/external/icu/icu4c/LICENSE",
- "licenses/external/icu/icu4c/license.html",
- ],
-}
-
-license {
name: "i18n-module-test-exports_external_icu_icu4c_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -87,23 +46,6 @@
}
license {
- name: "i18n-module-test-exports_external_icu_license@current",
- sdk_member_name: "external_icu_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-EPL",
- "SPDX-license-identifier-ICU",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- "legacy_unencumbered",
- ],
- license_text: ["licenses/external/icu/NOTICE"],
-}
-
-license {
name: "i18n-module-test-exports_external_icu_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -120,60 +62,6 @@
}
cc_prebuilt_library_shared {
- name: "i18n-module-test-exports_libicui18n@current",
- sdk_member_name: "libicui18n",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.i18n",
- ],
- licenses: ["i18n-module-test-exports_external_icu_icu4c_license@current"],
- host_supported: true,
- installable: false,
- unique_host_soname: true,
- shared_libs: ["i18n-module-test-exports_libicuuc@current"],
- export_include_dirs: ["common_os/include/external/icu/icu4c/source/i18n"],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libicui18n.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libicui18n.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libicui18n.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libicui18n.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libicui18n-host.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libicui18n-host.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libicui18n-host.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libicui18n",
prefer: false,
visibility: ["//visibility:public"],
@@ -227,73 +115,6 @@
}
cc_prebuilt_library_shared {
- name: "i18n-module-test-exports_libicuuc@current",
- sdk_member_name: "libicuuc",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-test-exports_external_icu_icu4c_license@current"],
- host_supported: true,
- installable: false,
- unique_host_soname: true,
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- shared_libs: [
- "libbase",
- "liblog",
- ],
- export_include_dirs: [
- "android/include/external/icu/icu4c/source/common",
- "android/include/external/icu/android_icu4c/include",
- ],
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libicuuc.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libicuuc.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libicuuc.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libicuuc.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- export_include_dirs: [
- "linux_bionic/include/external/icu/icu4c/source/common",
- "linux_bionic/include/external/icu/android_icu4c/include",
- "linux_bionic/include/external/icu/libandroidicuinit/include",
- ],
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libicuuc-host.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- export_include_dirs: [
- "linux_glibc/include/external/icu/icu4c/source/common",
- "linux_glibc/include/external/icu/android_icu4c/include",
- "linux_glibc/include/external/icu/libandroidicuinit/include",
- ],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libicuuc-host.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libicuuc-host.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libicuuc",
prefer: false,
visibility: ["//visibility:public"],
@@ -360,64 +181,6 @@
}
cc_prebuilt_library_shared {
- name: "i18n-module-test-exports_libicu_jni@current",
- sdk_member_name: "libicu_jni",
- visibility: [
- "//external/icu/android_icu4j/libcore_bridge/src/native",
- "//packages/modules/RuntimeI18n/apex",
- ],
- apex_available: ["com.android.i18n"],
- licenses: ["i18n-module-test-exports_external_icu_license@current"],
- host_supported: true,
- installable: false,
- shared_libs: [
- "libbase",
- "i18n-module-test-exports_libicuuc@current",
- "i18n-module-test-exports_libicui18n@current",
- "liblog",
- "libnativehelper",
- ],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libicu_jni.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libicu_jni.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libicu_jni.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libicu_jni.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libicu_jni.so"],
- },
- linux_glibc: {
- compile_multilib: "both",
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/lib/libicu_jni.so"],
- },
- linux_glibc_x86: {
- enabled: true,
- srcs: ["linux_glibc/x86/lib/libicu_jni.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libicu_jni",
prefer: false,
visibility: [
@@ -473,34 +236,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "i18n-module-test-exports@current",
- visibility: ["//visibility:public"],
- host_supported: true,
- native_shared_libs: [
- "i18n-module-test-exports_libicui18n@current",
- "i18n-module-test-exports_libicuuc@current",
- "i18n-module-test-exports_libicu_jni@current",
- ],
- target: {
- android: {
- java_libs: ["i18n-module-test-exports_core-icu4j-for-host@current"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_glibc_x86: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/mainline/platform/test-exports/Android.bp b/mainline/platform/test-exports/Android.bp
index 761dc64..6825e1a 100755
--- a/mainline/platform/test-exports/Android.bp
+++ b/mainline/platform/test-exports/Android.bp
@@ -7,14 +7,6 @@
}
license {
- name: "platform-mainline-test-exports_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: "platform-mainline-test-exports_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -22,16 +14,6 @@
}
license {
- name: "platform-mainline-test-exports_system_core_debuggerd_license@current",
- sdk_member_name: "system_core_debuggerd_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- ],
-}
-
-license {
name: "platform-mainline-test-exports_system_core_debuggerd_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -41,38 +23,6 @@
}
cc_prebuilt_library_shared {
- name: "platform-mainline-test-exports_libtombstoned_client@current",
- sdk_member_name: "libtombstoned_client",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- licenses: ["platform-mainline-test-exports_system_core_debuggerd_license@current"],
- installable: false,
- compile_multilib: "both",
- shared_libs: [
- "libbase",
- "libcutils",
- ],
- export_include_dirs: [
- "include/system/core/debuggerd/tombstoned/include",
- "include/system/core/debuggerd/common/include",
- ],
- arch: {
- arm64: {
- srcs: ["arm64/lib/libtombstoned_client.so"],
- },
- x86_64: {
- srcs: ["x86_64/lib/libtombstoned_client.so"],
- },
- arm: {
- srcs: ["arm/lib/libtombstoned_client.so"],
- },
- x86: {
- srcs: ["x86/lib/libtombstoned_client.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libtombstoned_client",
prefer: false,
visibility: ["//visibility:public"],
@@ -102,9 +52,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "platform-mainline-test-exports@current",
- visibility: ["//visibility:public"],
- native_shared_libs: ["platform-mainline-test-exports_libtombstoned_client@current"],
-}
diff --git a/mainline/runtime/host-exports/Android.bp b/mainline/runtime/host-exports/Android.bp
index b84694d..9f6da86 100755
--- a/mainline/runtime/host-exports/Android.bp
+++ b/mainline/runtime/host-exports/Android.bp
@@ -7,14 +7,6 @@
}
license {
- name: "runtime-module-host-exports_bionic_apex_license@current",
- sdk_member_name: "bionic_apex_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/bionic/apex/NOTICE"],
-}
-
-license {
name: "runtime-module-host-exports_bionic_apex_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -22,14 +14,6 @@
}
license {
- name: "runtime-module-host-exports_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: "runtime-module-host-exports_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -37,14 +21,6 @@
}
license {
- name: "runtime-module-host-exports_bionic_linker_license@current",
- sdk_member_name: "bionic_linker_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-BSD"],
- license_text: ["licenses/bionic/linker/NOTICE"],
-}
-
-license {
name: "runtime-module-host-exports_bionic_linker_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-BSD"],
@@ -52,35 +28,6 @@
}
cc_prebuilt_binary {
- name: "runtime-module-host-exports_linkerconfig@current",
- sdk_member_name: "linkerconfig",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-host-exports_Android-Apache-2.0@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/bin/linkerconfig"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/bin/linkerconfig"],
- },
- },
-}
-
-cc_prebuilt_binary {
name: "linkerconfig",
prefer: false,
visibility: ["//visibility:public"],
@@ -109,34 +56,6 @@
}
cc_prebuilt_binary {
- name: "runtime-module-host-exports_linker@current",
- sdk_member_name: "linker",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-host-exports_bionic_linker_license@current"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "none",
- compile_multilib: "64",
- system_shared_libs: [],
- static_executable: true,
- nocrt: true,
- target: {
- host: {
- enabled: false,
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["x86_64/bin/linker64"],
- },
- },
-}
-
-cc_prebuilt_binary {
name: "linker",
prefer: false,
visibility: ["//visibility:public"],
@@ -162,31 +81,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "runtime-module-host-exports@current",
- visibility: ["//visibility:public"],
- device_supported: false,
- host_supported: true,
- compile_multilib: "64",
- target: {
- linux_bionic: {
- native_binaries: [
- "runtime-module-host-exports_linkerconfig@current",
- "runtime-module-host-exports_linker@current",
- ],
- },
- linux_glibc: {
- native_binaries: ["runtime-module-host-exports_linkerconfig@current"],
- },
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/mainline/runtime/sdk/Android.bp b/mainline/runtime/sdk/Android.bp
index c75f9c0..0f0f899 100755
--- a/mainline/runtime/sdk/Android.bp
+++ b/mainline/runtime/sdk/Android.bp
@@ -7,14 +7,6 @@
}
license {
- name: "runtime-module-sdk_bionic_apex_license@current",
- sdk_member_name: "bionic_apex_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/bionic/apex/NOTICE"],
-}
-
-license {
name: "runtime-module-sdk_bionic_apex_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -22,21 +14,6 @@
}
license {
- name: "runtime-module-sdk_bionic_libc_license@current",
- sdk_member_name: "bionic_libc_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "legacy_notice",
- "legacy_unencumbered",
- ],
- license_text: ["licenses/bionic/libc/NOTICE"],
-}
-
-license {
name: "runtime-module-sdk_bionic_libc_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -51,14 +28,6 @@
}
license {
- name: "runtime-module-sdk_bionic_libdl_license@current",
- sdk_member_name: "bionic_libdl_license",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/bionic/libdl/NOTICE"],
-}
-
-license {
name: "runtime-module-sdk_bionic_libdl_license",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -66,19 +35,6 @@
}
license {
- name: "runtime-module-sdk_bionic_libm_license@current",
- sdk_member_name: "bionic_libm_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-MIT",
- "legacy_unencumbered",
- ],
- license_text: ["licenses/bionic/libm/NOTICE"],
-}
-
-license {
name: "runtime-module-sdk_bionic_libm_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -91,53 +47,6 @@
}
cc_prebuilt_library_headers {
- name: "runtime-module-sdk_bionic_libc_platform_headers@current",
- sdk_member_name: "bionic_libc_platform_headers",
- visibility: [
- "//art:__subpackages__",
- "//bionic:__subpackages__",
- "//device/generic/goldfish-opengl:__subpackages__",
- "//external/gwp_asan:__subpackages__",
- "//external/perfetto:__subpackages__",
- "//external/scudo:__subpackages__",
- "//frameworks:__subpackages__",
- "//system/core/debuggerd:__subpackages__",
- "//system/core/libcutils:__subpackages__",
- "//system/memory/libmemunreachable:__subpackages__",
- "//system/unwinding/libunwindstack:__subpackages__",
- "//tools/security/sanitizer-status:__subpackages__",
- ],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- "com.android.media",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- sdk_version: "current",
- stl: "none",
- system_shared_libs: [],
- export_include_dirs: ["common_os/include/bionic/libc/platform"],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
-
-cc_prebuilt_library_headers {
name: "bionic_libc_platform_headers",
prefer: false,
visibility: [
@@ -186,89 +95,6 @@
}
cc_prebuilt_library_headers {
- name: "runtime-module-sdk_libc_headers@current",
- sdk_member_name: "libc_headers",
- visibility: [
- "//bionic:__subpackages__",
- "//external/arm-optimized-routines",
- "//external/gwp_asan",
- "//external/jemalloc_new",
- "//external/libunwind_llvm",
- "//external/scudo",
- "//system/core/property_service/libpropertyinfoparser",
- "//system/extras/toolchain-extras",
- ],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- sdk_version: "1",
- stl: "none",
- system_shared_libs: [],
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- export_system_include_dirs: [
- "android/arm64/include/bionic/libc/include",
- "android/arm64/include/bionic/libc/kernel/uapi/asm-arm64",
- "android/arm64/include/bionic/libc/kernel/uapi",
- "android/arm64/include/bionic/libc/kernel/android/scsi",
- "android/arm64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86_64: {
- export_system_include_dirs: [
- "android/x86_64/include/bionic/libc/include",
- "android/x86_64/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86_64/include/bionic/libc/kernel/uapi",
- "android/x86_64/include/bionic/libc/kernel/android/scsi",
- "android/x86_64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_arm: {
- export_system_include_dirs: [
- "android/arm/include/bionic/libc/include",
- "android/arm/include/bionic/libc/kernel/uapi/asm-arm",
- "android/arm/include/bionic/libc/kernel/uapi",
- "android/arm/include/bionic/libc/kernel/android/scsi",
- "android/arm/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86: {
- export_system_include_dirs: [
- "android/x86/include/bionic/libc/include",
- "android/x86/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86/include/bionic/libc/kernel/uapi",
- "android/x86/include/bionic/libc/kernel/android/scsi",
- "android/x86/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic: {
- compile_multilib: "64",
- export_system_include_dirs: [
- "linux_bionic/include/bionic/libc/include",
- "linux_bionic/include/bionic/libc/kernel/uapi/asm-x86",
- "linux_bionic/include/bionic/libc/kernel/uapi",
- "linux_bionic/include/bionic/libc/kernel/android/scsi",
- "linux_bionic/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
-
-cc_prebuilt_library_headers {
name: "libc_headers",
prefer: false,
visibility: [
@@ -352,48 +178,6 @@
}
cc_prebuilt_object {
- name: "runtime-module-sdk_crtbegin_dynamic@current",
- sdk_member_name: "crtbegin_dynamic",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- target: {
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/crtbegin_dynamic.o"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/crtbegin_dynamic.o"],
- },
- android_arm: {
- srcs: ["android/arm/lib/crtbegin_dynamic.o"],
- },
- android_x86: {
- srcs: ["android/x86/lib/crtbegin_dynamic.o"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- srcs: ["linux_bionic/x86_64/lib/crtbegin_dynamic.o"],
- },
- },
-}
-
-cc_prebuilt_object {
name: "crtbegin_dynamic",
prefer: false,
visibility: ["//visibility:public"],
@@ -436,48 +220,6 @@
}
cc_prebuilt_object {
- name: "runtime-module-sdk_crtbegin_so@current",
- sdk_member_name: "crtbegin_so",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- target: {
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/crtbegin_so.o"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/crtbegin_so.o"],
- },
- android_arm: {
- srcs: ["android/arm/lib/crtbegin_so.o"],
- },
- android_x86: {
- srcs: ["android/x86/lib/crtbegin_so.o"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- srcs: ["linux_bionic/x86_64/lib/crtbegin_so.o"],
- },
- },
-}
-
-cc_prebuilt_object {
name: "crtbegin_so",
prefer: false,
visibility: ["//visibility:public"],
@@ -520,48 +262,6 @@
}
cc_prebuilt_object {
- name: "runtime-module-sdk_crtend_android@current",
- sdk_member_name: "crtend_android",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- target: {
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/crtend.o"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/crtend.o"],
- },
- android_arm: {
- srcs: ["android/arm/lib/crtend.o"],
- },
- android_x86: {
- srcs: ["android/x86/lib/crtend.o"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- srcs: ["linux_bionic/x86_64/lib/crtend.o"],
- },
- },
-}
-
-cc_prebuilt_object {
name: "crtend_android",
prefer: false,
visibility: ["//visibility:public"],
@@ -604,48 +304,6 @@
}
cc_prebuilt_object {
- name: "runtime-module-sdk_crtend_so@current",
- sdk_member_name: "crtend_so",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- vendor_available: true,
- product_available: true,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- target: {
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/crtend_so.o"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/crtend_so.o"],
- },
- android_arm: {
- srcs: ["android/arm/lib/crtend_so.o"],
- },
- android_x86: {
- srcs: ["android/x86/lib/crtend_so.o"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- srcs: ["linux_bionic/x86_64/lib/crtend_so.o"],
- },
- },
-}
-
-cc_prebuilt_object {
name: "crtend_so",
prefer: false,
visibility: ["//visibility:public"],
@@ -688,101 +346,6 @@
}
cc_prebuilt_library_shared {
- name: "runtime-module-sdk_libc@current",
- sdk_member_name: "libc",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- installable: false,
- stl: "none",
- system_shared_libs: [],
- export_include_dirs: [
- "common_os/include/bionic/libc/async_safe/include",
- "common_os/include/system/logging/liblog/include",
- "common_os/include/bionic/libc/system_properties/include",
- "common_os/include/system/core/property_service/libpropertyinfoparser/include",
- ],
- sanitize: {
- address: false,
- fuzzer: false,
- integer_overflow: false,
- },
- stubs: {
- versions: [
- "29",
- "30",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libc.so"],
- export_system_include_dirs: [
- "android/arm64/include/bionic/libc/include",
- "android/arm64/include/bionic/libc/kernel/uapi/asm-arm64",
- "android/arm64/include/bionic/libc/kernel/uapi",
- "android/arm64/include/bionic/libc/kernel/android/scsi",
- "android/arm64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libc.so"],
- export_system_include_dirs: [
- "android/x86_64/include/bionic/libc/include",
- "android/x86_64/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86_64/include/bionic/libc/kernel/uapi",
- "android/x86_64/include/bionic/libc/kernel/android/scsi",
- "android/x86_64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_arm: {
- srcs: ["android/arm/lib/libc.so"],
- export_system_include_dirs: [
- "android/arm/include/bionic/libc/include",
- "android/arm/include/bionic/libc/kernel/uapi/asm-arm",
- "android/arm/include/bionic/libc/kernel/uapi",
- "android/arm/include/bionic/libc/kernel/android/scsi",
- "android/arm/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86: {
- srcs: ["android/x86/lib/libc.so"],
- export_system_include_dirs: [
- "android/x86/include/bionic/libc/include",
- "android/x86/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86/include/bionic/libc/kernel/uapi",
- "android/x86/include/bionic/libc/kernel/android/scsi",
- "android/x86/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic: {
- compile_multilib: "64",
- export_system_include_dirs: [
- "linux_bionic/include/bionic/libc/include",
- "linux_bionic/include/bionic/libc/kernel/uapi/asm-x86",
- "linux_bionic/include/bionic/libc/kernel/uapi",
- "linux_bionic/include/bionic/libc/kernel/android/scsi",
- "linux_bionic/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libc.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libc",
prefer: false,
visibility: ["//visibility:public"],
@@ -877,92 +440,6 @@
}
cc_prebuilt_library_shared {
- name: "runtime-module-sdk_libdl@current",
- sdk_member_name: "libdl",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libdl_license@current"],
- host_supported: true,
- installable: false,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- stubs: {
- versions: [
- "29",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libdl.so"],
- export_system_include_dirs: [
- "android/arm64/include/bionic/libc/include",
- "android/arm64/include/bionic/libc/kernel/uapi/asm-arm64",
- "android/arm64/include/bionic/libc/kernel/uapi",
- "android/arm64/include/bionic/libc/kernel/android/scsi",
- "android/arm64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libdl.so"],
- export_system_include_dirs: [
- "android/x86_64/include/bionic/libc/include",
- "android/x86_64/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86_64/include/bionic/libc/kernel/uapi",
- "android/x86_64/include/bionic/libc/kernel/android/scsi",
- "android/x86_64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_arm: {
- srcs: ["android/arm/lib/libdl.so"],
- export_system_include_dirs: [
- "android/arm/include/bionic/libc/include",
- "android/arm/include/bionic/libc/kernel/uapi/asm-arm",
- "android/arm/include/bionic/libc/kernel/uapi",
- "android/arm/include/bionic/libc/kernel/android/scsi",
- "android/arm/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86: {
- srcs: ["android/x86/lib/libdl.so"],
- export_system_include_dirs: [
- "android/x86/include/bionic/libc/include",
- "android/x86/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86/include/bionic/libc/kernel/uapi",
- "android/x86/include/bionic/libc/kernel/android/scsi",
- "android/x86/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic: {
- compile_multilib: "64",
- export_system_include_dirs: [
- "linux_bionic/include/bionic/libc/include",
- "linux_bionic/include/bionic/libc/kernel/uapi/asm-x86",
- "linux_bionic/include/bionic/libc/kernel/uapi",
- "linux_bionic/include/bionic/libc/kernel/android/scsi",
- "linux_bionic/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libdl.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libdl",
prefer: false,
visibility: ["//visibility:public"],
@@ -1048,54 +525,6 @@
}
cc_prebuilt_library_shared {
- name: "runtime-module-sdk_libdl_android@current",
- sdk_member_name: "libdl_android",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libdl_license@current"],
- host_supported: true,
- installable: false,
- stl: "none",
- system_shared_libs: [],
- sanitize: {
- never: true,
- },
- stubs: {
- versions: ["current"],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libdl_android.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libdl_android.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libdl_android.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libdl_android.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libdl_android.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libdl_android",
prefer: false,
visibility: ["//visibility:public"],
@@ -1143,59 +572,6 @@
}
cc_prebuilt_library_shared {
- name: "runtime-module-sdk_libm@current",
- sdk_member_name: "libm",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libm_license@current"],
- host_supported: true,
- installable: false,
- stl: "none",
- system_shared_libs: ["runtime-module-sdk_libc@current"],
- sanitize: {
- address: false,
- fuzzer: false,
- integer_overflow: false,
- },
- stubs: {
- versions: [
- "29",
- "current",
- ],
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libm.so"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libm.so"],
- },
- android_arm: {
- srcs: ["android/arm/lib/libm.so"],
- },
- android_x86: {
- srcs: ["android/x86/lib/libm.so"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libm.so"],
- },
- },
-}
-
-cc_prebuilt_library_shared {
name: "libm",
prefer: false,
visibility: ["//visibility:public"],
@@ -1248,98 +624,6 @@
}
cc_prebuilt_library_static {
- name: "runtime-module-sdk_libasync_safe@current",
- sdk_member_name: "libasync_safe",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:platform",
- "com.android.art",
- "com.android.art.debug",
- "com.android.media",
- "com.android.media.swcodec",
- "com.android.runtime",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- installable: false,
- vendor_available: true,
- product_available: true,
- stl: "none",
- system_shared_libs: [],
- export_include_dirs: [
- "common_os/include/bionic/libc/async_safe/include",
- "common_os/include/system/logging/liblog/include",
- ],
- sanitize: {
- address: false,
- fuzzer: false,
- integer_overflow: false,
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/libasync_safe.a"],
- export_system_include_dirs: [
- "android/arm64/include/bionic/libc/include",
- "android/arm64/include/bionic/libc/kernel/uapi/asm-arm64",
- "android/arm64/include/bionic/libc/kernel/uapi",
- "android/arm64/include/bionic/libc/kernel/android/scsi",
- "android/arm64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/libasync_safe.a"],
- export_system_include_dirs: [
- "android/x86_64/include/bionic/libc/include",
- "android/x86_64/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86_64/include/bionic/libc/kernel/uapi",
- "android/x86_64/include/bionic/libc/kernel/android/scsi",
- "android/x86_64/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_arm: {
- srcs: ["android/arm/lib/libasync_safe.a"],
- export_system_include_dirs: [
- "android/arm/include/bionic/libc/include",
- "android/arm/include/bionic/libc/kernel/uapi/asm-arm",
- "android/arm/include/bionic/libc/kernel/uapi",
- "android/arm/include/bionic/libc/kernel/android/scsi",
- "android/arm/include/bionic/libc/kernel/android/uapi",
- ],
- },
- android_x86: {
- srcs: ["android/x86/lib/libasync_safe.a"],
- export_system_include_dirs: [
- "android/x86/include/bionic/libc/include",
- "android/x86/include/bionic/libc/kernel/uapi/asm-x86",
- "android/x86/include/bionic/libc/kernel/uapi",
- "android/x86/include/bionic/libc/kernel/android/scsi",
- "android/x86/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic: {
- compile_multilib: "64",
- export_system_include_dirs: [
- "linux_bionic/include/bionic/libc/include",
- "linux_bionic/include/bionic/libc/kernel/uapi/asm-x86",
- "linux_bionic/include/bionic/libc/kernel/uapi",
- "linux_bionic/include/bionic/libc/kernel/android/scsi",
- "linux_bionic/include/bionic/libc/kernel/android/uapi",
- ],
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/libasync_safe.a"],
- },
- },
-}
-
-cc_prebuilt_library_static {
name: "libasync_safe",
prefer: false,
visibility: ["//visibility:public"],
@@ -1427,53 +711,6 @@
}
cc_prebuilt_library_static {
- name: "runtime-module-sdk_note_memtag_heap_async@current",
- sdk_member_name: "note_memtag_heap_async",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- installable: false,
- vendor_available: true,
- product_available: true,
- sdk_version: "minimum",
- stl: "none",
- sanitize: {
- never: true,
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/note_memtag_heap_async.a"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/note_memtag_heap_async.a"],
- },
- android_arm: {
- srcs: ["android/arm/lib/note_memtag_heap_async.a"],
- },
- android_x86: {
- srcs: ["android/x86/lib/note_memtag_heap_async.a"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/note_memtag_heap_async.a"],
- },
- },
-}
-
-cc_prebuilt_library_static {
name: "note_memtag_heap_async",
prefer: false,
visibility: ["//visibility:public"],
@@ -1520,53 +757,6 @@
}
cc_prebuilt_library_static {
- name: "runtime-module-sdk_note_memtag_heap_sync@current",
- sdk_member_name: "note_memtag_heap_sync",
- visibility: ["//visibility:public"],
- apex_available: [
- "//apex_available:anyapex",
- "//apex_available:platform",
- ],
- licenses: ["runtime-module-sdk_bionic_libc_license@current"],
- host_supported: true,
- installable: false,
- vendor_available: true,
- product_available: true,
- sdk_version: "minimum",
- stl: "none",
- sanitize: {
- never: true,
- },
- target: {
- host: {
- enabled: false,
- },
- android: {
- compile_multilib: "both",
- },
- android_arm64: {
- srcs: ["android/arm64/lib/note_memtag_heap_sync.a"],
- },
- android_x86_64: {
- srcs: ["android/x86_64/lib/note_memtag_heap_sync.a"],
- },
- android_arm: {
- srcs: ["android/arm/lib/note_memtag_heap_sync.a"],
- },
- android_x86: {
- srcs: ["android/x86/lib/note_memtag_heap_sync.a"],
- },
- linux_bionic: {
- compile_multilib: "64",
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/lib/note_memtag_heap_sync.a"],
- },
- },
-}
-
-cc_prebuilt_library_static {
name: "note_memtag_heap_sync",
prefer: false,
visibility: ["//visibility:public"],
@@ -1611,41 +801,3 @@
},
},
}
-
-sdk_snapshot {
- name: "runtime-module-sdk@current",
- visibility: ["//visibility:public"],
- host_supported: true,
- native_header_libs: [
- "runtime-module-sdk_bionic_libc_platform_headers@current",
- "runtime-module-sdk_libc_headers@current",
- ],
- native_objects: [
- "runtime-module-sdk_crtbegin_dynamic@current",
- "runtime-module-sdk_crtbegin_so@current",
- "runtime-module-sdk_crtend_android@current",
- "runtime-module-sdk_crtend_so@current",
- ],
- native_shared_libs: [
- "runtime-module-sdk_libc@current",
- "runtime-module-sdk_libdl@current",
- "runtime-module-sdk_libdl_android@current",
- "runtime-module-sdk_libm@current",
- ],
- native_static_libs: [
- "runtime-module-sdk_libasync_safe@current",
- "runtime-module-sdk_note_memtag_heap_async@current",
- "runtime-module-sdk_note_memtag_heap_sync@current",
- ],
- target: {
- linux_bionic: {
- compile_multilib: "64",
- },
- host: {
- enabled: false,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/mainline/statsd/stats-log-api-gen-exports/Android.bp b/mainline/statsd/stats-log-api-gen-exports/Android.bp
index a4399cc..134d715 100755
--- a/mainline/statsd/stats-log-api-gen-exports/Android.bp
+++ b/mainline/statsd/stats-log-api-gen-exports/Android.bp
@@ -5,31 +5,6 @@
}
cc_prebuilt_binary {
- name: "stats-log-api-gen-exports_stats-log-api-gen@current",
- sdk_member_name: "stats-log-api-gen",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- device_supported: false,
- host_supported: true,
- installable: false,
- stl: "c++_static",
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_bionic_x86_64: {
- enabled: true,
- srcs: ["linux_bionic/x86_64/bin/stats-log-api-gen"],
- },
- linux_glibc_x86_64: {
- enabled: true,
- srcs: ["linux_glibc/x86_64/bin/stats-log-api-gen"],
- },
- },
-}
-
-cc_prebuilt_binary {
name: "stats-log-api-gen",
prefer: false,
visibility: ["//visibility:public"],
@@ -52,23 +27,3 @@
},
},
}
-
-module_exports_snapshot {
- name: "stats-log-api-gen-exports@current",
- visibility: ["//visibility:public"],
- device_supported: false,
- host_supported: true,
- native_binaries: ["stats-log-api-gen-exports_stats-log-api-gen@current"],
- compile_multilib: "64",
- target: {
- host: {
- enabled: false,
- },
- linux_glibc_x86_64: {
- enabled: true,
- },
- linux_bionic_x86_64: {
- enabled: true,
- },
- },
-}
diff --git a/mainline/tzdata/test-exports/Android.bp b/mainline/tzdata/test-exports/Android.bp
index 8d7274a..1afa62b 100755
--- a/mainline/tzdata/test-exports/Android.bp
+++ b/mainline/tzdata/test-exports/Android.bp
@@ -7,15 +7,6 @@
}
java_import {
- name: "tzdata-module-test-exports_tzdata-testing@current",
- sdk_member_name: "tzdata-testing",
- visibility: ["//visibility:public"],
- apex_available: ["//apex_available:platform"],
- licenses: ["tzdata-module-test-exports_system_timezone_license@current"],
- jars: ["java/tzdata-testing.jar"],
-}
-
-java_import {
name: "tzdata-testing",
prefer: false,
visibility: ["//visibility:public"],
@@ -25,20 +16,6 @@
}
license {
- name: "tzdata-module-test-exports_system_timezone_license@current",
- sdk_member_name: "system_timezone_license",
- visibility: ["//visibility:private"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-MIT",
- "SPDX-license-identifier-Unicode-DFS",
- "legacy_notice",
- "legacy_unencumbered",
- ],
-}
-
-license {
name: "tzdata-module-test-exports_system_timezone_license",
visibility: ["//visibility:private"],
license_kinds: [
@@ -50,9 +27,3 @@
"legacy_unencumbered",
],
}
-
-module_exports_snapshot {
- name: "tzdata-module-test-exports@current",
- visibility: ["//visibility:public"],
- java_libs: ["tzdata-module-test-exports_tzdata-testing@current"],
-}
