From 5059939c87f4806a8c9f67cfbd1a4f9fe2d4e59c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 25 May 2017 17:13:32 -0700 Subject: [PATCH] Enable exporting the non-uapi scsi headers. Callers are supposed to #include but if we tell soong to add bionic/libc/kernel/android/ to the include path, the uapi headers in there would be (unintentionally) accessible as either or . Bug: N/A (hit while upgrading strace to 4.17) Test: builds Change-Id: I8d47dd51da688c38f747a255d401dfb2c209c805 --- libc/Android.bp | 2 +- libc/kernel/android/scsi/{ => scsi}/scsi.h | 0 .../android/scsi/{ => scsi}/scsi_ioctl.h | 0 .../android/scsi/{ => scsi}/scsi_proto.h | 0 libc/kernel/android/scsi/{ => scsi}/sg.h | 0 libc/kernel/tools/update_all.py | 2 +- tests/Android.bp | 1 + tests/scsi_sg_test.cpp | 19 +++++++++++++++++++ 8 files changed, 22 insertions(+), 2 deletions(-) rename libc/kernel/android/scsi/{ => scsi}/scsi.h (100%) rename libc/kernel/android/scsi/{ => scsi}/scsi_ioctl.h (100%) rename libc/kernel/android/scsi/{ => scsi}/scsi_proto.h (100%) rename libc/kernel/android/scsi/{ => scsi}/sg.h (100%) create mode 100644 tests/scsi_sg_test.cpp diff --git a/libc/Android.bp b/libc/Android.bp index cda9eaae4..5a1c28784 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -2097,7 +2097,7 @@ ndk_headers { ndk_headers { name: "libc_kernel_android_scsi", - from: "kernel/android/scsi", + from: "kernel/android/scsi/scsi", to: "scsi", srcs: ["kernel/android/scsi/**/*.h"], license: "NOTICE", diff --git a/libc/kernel/android/scsi/scsi.h b/libc/kernel/android/scsi/scsi/scsi.h similarity index 100% rename from libc/kernel/android/scsi/scsi.h rename to libc/kernel/android/scsi/scsi/scsi.h diff --git a/libc/kernel/android/scsi/scsi_ioctl.h b/libc/kernel/android/scsi/scsi/scsi_ioctl.h similarity index 100% rename from libc/kernel/android/scsi/scsi_ioctl.h rename to libc/kernel/android/scsi/scsi/scsi_ioctl.h diff --git a/libc/kernel/android/scsi/scsi_proto.h b/libc/kernel/android/scsi/scsi/scsi_proto.h similarity index 100% rename from libc/kernel/android/scsi/scsi_proto.h rename to libc/kernel/android/scsi/scsi/scsi_proto.h diff --git a/libc/kernel/android/scsi/sg.h b/libc/kernel/android/scsi/scsi/sg.h similarity index 100% rename from libc/kernel/android/scsi/sg.h rename to libc/kernel/android/scsi/scsi/sg.h diff --git a/libc/kernel/tools/update_all.py b/libc/kernel/tools/update_all.py index e5a07f8c2..0f30ecdae 100755 --- a/libc/kernel/tools/update_all.py +++ b/libc/kernel/tools/update_all.py @@ -95,6 +95,6 @@ updater = BatchFileUpdater() processFiles(updater, original_dir, modified_dir, "uapi", "uapi"), # Now process the special files. -processFiles(updater, original_dir, modified_dir, "scsi", os.path.join("android", "scsi")) +processFiles(updater, original_dir, modified_dir, "scsi", os.path.join("android", "scsi", "scsi")) updater.updateGitFiles() diff --git a/tests/Android.bp b/tests/Android.bp index 4605267ac..a03f1a66e 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -91,6 +91,7 @@ cc_test_library { "regex_test.cpp", "resolv_test.cpp", "sched_test.cpp", + "scsi_sg_test.cpp", "search_test.cpp", "semaphore_test.cpp", "setjmp_test.cpp", diff --git a/tests/scsi_sg_test.cpp b/tests/scsi_sg_test.cpp new file mode 100644 index 000000000..d1774ae2c --- /dev/null +++ b/tests/scsi_sg_test.cpp @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This test is just "does it compile?" because the scsi headers come from a special set. +#include +#include