diff options
author | Colin Cross <ccross@android.com> | 2021-04-28 18:09:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 18:09:01 +0000 |
commit | b2e9a0b1c0b02d6d54e80d1ce89d7315c0077036 (patch) | |
tree | b2e17733fabd68ce6758d1200c73a4db03a48d12 | |
parent | ab02a1a59d748582cfd48f07053fd48e886a0bd8 (diff) | |
parent | 6cac53807a7654bfa724d03615cca0cc6d8e91ee (diff) | |
download | bionic-b2e9a0b1c0b02d6d54e80d1ce89d7315c0077036.tar.gz |
Merge "Replace llndk_library with llndk clause in cc_library" am: 48166a4eaf am: 6cac53807a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1613420
Change-Id: I561879583a05c06dbb0241bade67cf738c207733
-rw-r--r-- | libc/Android.bp | 64 | ||||
-rw-r--r-- | libdl/Android.bp | 10 | ||||
-rw-r--r-- | libm/Android.bp | 11 |
3 files changed, 23 insertions, 62 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 9ffc4fe75..892262173 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1642,7 +1642,6 @@ cc_library { ], name: "libc", static_ndk_lib: true, - llndk_stubs: "libc.llndk", product_variables: { platform_sdk_version: { asflags: ["-DPLATFORM_SDK_VERSION=%d"], @@ -1766,7 +1765,12 @@ cc_library { "current", ], }, - + llndk: { + symbol_file: "libc.map.txt", + export_headers_as_system: true, + export_preprocessed_headers: ["include"], + export_llndk_headers: ["libc_llndk_headers"], + }, apex_available: [ "//apex_available:platform", "com.android.runtime", @@ -1857,13 +1861,11 @@ cc_library_headers { } cc_library_headers { - // Internal lib for use in libc_headers. Since we cannot intersect arch{} - // and target{} in the same module, this one specifies the arch-dependent - // include paths, and then libc_headers filters by target so that the - // headers only are included for Bionic targets. - name: "libc_headers_arch", + name: "libc_llndk_headers", visibility: ["//visibility:private"], - + llndk: { + llndk_headers: true, + }, host_supported: true, vendor_available: true, product_available: true, @@ -1891,7 +1893,6 @@ cc_library_headers { sdk_version: "1", export_system_include_dirs: [ - "include", "kernel/uapi", "kernel/android/scsi", "kernel/android/uapi", @@ -1954,12 +1955,14 @@ cc_library_headers { target: { android: { - header_libs: ["libc_headers_arch"], - export_header_lib_headers: ["libc_headers_arch"], + export_system_include_dirs: ["include"], + header_libs: ["libc_llndk_headers"], + export_header_lib_headers: ["libc_llndk_headers"], }, linux_bionic: { - header_libs: ["libc_headers_arch"], - export_header_lib_headers: ["libc_headers_arch"], + export_system_include_dirs: ["include"], + header_libs: ["libc_llndk_headers"], + export_header_lib_headers: ["libc_llndk_headers"], }, }, bazel_module: { bp2build_available: true }, @@ -2299,41 +2302,6 @@ ndk_library { first_version: "9", } -llndk_library { - name: "libc.llndk", - symbol_file: "libc.map.txt", - export_headers_as_system: true, - export_preprocessed_headers: ["include"], - native_bridge_supported: true, - export_include_dirs: [ - "kernel/uapi", - "kernel/android/scsi", - "kernel/android/uapi", - ], - arch: { - arm: { - export_include_dirs: [ - "kernel/uapi/asm-arm", - ], - }, - arm64: { - export_include_dirs: [ - "kernel/uapi/asm-arm64", - ], - }, - x86: { - export_include_dirs: [ - "kernel/uapi/asm-x86", - ], - }, - x86_64: { - export_include_dirs: [ - "kernel/uapi/asm-x86", - ], - }, - }, -} - ndk_library { name: "libstdc++", symbol_file: "libstdc++.map.txt", diff --git a/libdl/Android.bp b/libdl/Android.bp index 300467199..750a6e26f 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -56,7 +56,6 @@ cc_library { recovery_available: true, native_bridge_supported: true, static_ndk_lib: true, - llndk_stubs: "libdl.llndk", defaults: ["linux_bionic_supported"], @@ -137,6 +136,9 @@ cc_library { "current", ], }, + llndk: { + symbol_file: "libdl.map.txt", + }, apex_available: [ "//apex_available:platform", @@ -235,12 +237,6 @@ ndk_library { first_version: "9", } -llndk_library { - name: "libdl.llndk", - native_bridge_supported: true, - symbol_file: "libdl.map.txt", -} - genrule { name: "libdl.arm.map", out: ["libdl.arm.map"], diff --git a/libm/Android.bp b/libm/Android.bp index 10f794ad0..6c3abd129 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -26,7 +26,6 @@ cc_library { vendor_ramdisk_available: true, recovery_available: true, static_ndk_lib: true, - llndk_stubs: "libm.llndk", whole_static_libs: ["libarm-optimized-routines-math"], @@ -528,6 +527,10 @@ cc_library { ], }, + llndk: { + symbol_file: "libm.map.txt", + }, + apex_available: [ "//apex_available:platform", "com.android.runtime", @@ -544,12 +547,6 @@ ndk_library { first_version: "9", } -llndk_library { - name: "libm.llndk", - native_bridge_supported: true, - symbol_file: "libm.map.txt", -} - genrule { name: "libm.arm.map", out: ["libm.arm.map"], |