Merge "Remove Commodore 64 support." am: bd03a19252

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2261495

Change-Id: Id3a4fc82fd998e23f06972a071108e613dd9be16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2022-10-19 21:31:50 +00:00 committed by Automerger Merge Worker
commit 447c87737c
2 changed files with 35 additions and 35 deletions

View file

@ -27,16 +27,16 @@
load("//build/bazel/rules/apis:cc_api_contribution.bzl", "cc_api_contribution")
cc_api_contribution(
name="libc_contributions",
library_name="libc",
api=":libc.map.txt",
hdrs=[
"//bionic/libc/kernel/android:libc_kernel_android_uapi_headers",
"//bionic/libc/kernel/android:libc_kernel_android_scsi_headers",
"//bionic/libc/kernel/uapi:libc_kernel_uapi_headers",
"//bionic/libc/kernel/uapi:libc_kernal_uapi_asm_arm_headers", #arm
"//bionic/libc/kernel/uapi:libc_kernal_uapi_asm_arm64_headers", #arm64
"//bionic/libc/kernel/uapi:libc_kernal_uapi_asm_x86_headers", #x86
"//bionic/libc/kernel/uapi:libc_kernal_uapi_asm_x86_64_headers", #x86_64
],
name = "libc_contributions",
hdrs = [
"//bionic/libc/kernel/android:libc_kernel_android_scsi_headers",
"//bionic/libc/kernel/android:libc_kernel_android_uapi_headers",
"//bionic/libc/kernel/uapi:libc_kernel_uapi_asm_arm64_headers", #arm64
"//bionic/libc/kernel/uapi:libc_kernel_uapi_asm_arm_headers", #arm
"//bionic/libc/kernel/uapi:libc_kernel_uapi_asm_x86_64_headers", #x86_64
"//bionic/libc/kernel/uapi:libc_kernel_uapi_asm_x86_headers", #x86
"//bionic/libc/kernel/uapi:libc_kernel_uapi_headers",
],
api = ":libc.map.txt",
library_name = "libc",
)

View file

@ -29,39 +29,39 @@ load("//build/bazel/rules/apis:cc_api_contribution.bzl", "cc_api_headers")
package(default_visibility = ["//bionic/libc:__pkg__"])
cc_api_headers(
name="libc_kernel_uapi_headers",
hdrs=glob(["**/*.h"]),
system=True,
name = "libc_kernel_uapi_headers",
hdrs = glob(["**/*.h"]),
system = True,
)
cc_api_headers(
name="libc_kernal_uapi_asm_arm_headers",
include_dir="asm-arm",
hdrs=glob(["asm-arm/**/*.h"]),
system=True,
arch="arm",
name = "libc_kernel_uapi_asm_arm_headers",
hdrs = glob(["asm-arm/**/*.h"]),
arch = "arm",
include_dir = "asm-arm",
system = True,
)
cc_api_headers(
name="libc_kernal_uapi_asm_arm64_headers",
include_dir="asm-arm64",
hdrs=glob(["asm-arm64/**/*.h"]),
system=True,
arch="arm64",
name = "libc_kernel_uapi_asm_arm64_headers",
hdrs = glob(["asm-arm64/**/*.h"]),
arch = "arm64",
include_dir = "asm-arm64",
system = True,
)
cc_api_headers(
name="libc_kernal_uapi_asm_x86_headers",
include_dir="asm-x86",
hdrs=glob(["asm-x86/**/*.h"]),
system=True,
arch="x86",
name = "libc_kernel_uapi_asm_x86_headers",
hdrs = glob(["asm-x86/**/*.h"]),
arch = "x86",
include_dir = "asm-x86",
system = True,
)
cc_api_headers(
name="libc_kernal_uapi_asm_x86_64_headers",
include_dir="asm-x86_64",
hdrs=glob(["asm-x86_64/**/*.h"]),
system=True,
arch="x86_64",
name = "libc_kernel_uapi_asm_x86_64_headers",
hdrs = glob(["asm-x86_64/**/*.h"]),
arch = "x86_64",
include_dir = "asm-x86_64",
system = True,
)