[fidl] Move public fidl headers to match naming convention
The fidl library provides headers intended for general use, so the
include path should be spelled <lib/fidl/foo.h> as per
https://fuchsia.googlesource.com/docs/+/master/development/languages/c-cpp/naming.md.
This moves the headers into the proper location and updates includes to
match.
Change-Id: I9db162c3fd40170d63730bc9b7079c7e7e950982
diff --git a/docs/fidl/c-language-bindings.md b/docs/fidl/c-language-bindings.md
index d6972ec..9d4e965 100644
--- a/docs/fidl/c-language-bindings.md
+++ b/docs/fidl/c-language-bindings.md
@@ -292,8 +292,8 @@
# fidl_encode()
Declared in
-[system/ulib/fidl/include/fidl/coding.h](
-https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/include/fidl/coding.h),
+[system/ulib/fidl/include/lib/fidl/coding.h](
+https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/include/lib/fidl/coding.h),
defined in
[system/ulib/fidl/encoding.cpp](
https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/encoding.cpp).
@@ -370,8 +370,8 @@
# fidl_decode()
Declared in
-[system/ulib/fidl/include/fidl/coding.h](
-https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/include/fidl/coding.h),
+[system/ulib/fidl/include/lib/fidl/coding.h](
+https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/include/lib/fidl/coding.h),
defined in
[system/ulib/fidl/decoding.cpp](
https://fuchsia.googlesource.com/zircon/+/HEAD/system/ulib/fidl/decoding.cpp).
diff --git a/system/host/fidl/lib/c_generator.cpp b/system/host/fidl/lib/c_generator.cpp
index 5b5b14d..07d1980 100644
--- a/system/host/fidl/lib/c_generator.cpp
+++ b/system/host/fidl/lib/c_generator.cpp
@@ -186,7 +186,7 @@
EmitBlank(&header_file_);
EmitIncludeHeader(&header_file_, "<stdbool.h>");
EmitIncludeHeader(&header_file_, "<stdint.h>");
- EmitIncludeHeader(&header_file_, "<fidl/coding.h>");
+ EmitIncludeHeader(&header_file_, "<lib/fidl/coding.h>");
EmitIncludeHeader(&header_file_, "<zircon/fidl.h>");
EmitIncludeHeader(&header_file_, "<zircon/syscalls/object.h>");
EmitIncludeHeader(&header_file_, "<zircon/types.h>");
diff --git a/system/host/fidl/lib/tables_generator.cpp b/system/host/fidl/lib/tables_generator.cpp
index abaeb83..0ef6402 100644
--- a/system/host/fidl/lib/tables_generator.cpp
+++ b/system/host/fidl/lib/tables_generator.cpp
@@ -68,7 +68,7 @@
}
void TablesGenerator::GenerateFilePreamble() {
- GenerateInclude("<fidl/internal.h>");
+ GenerateInclude("<lib/fidl/internal.h>");
Emit(&tables_file_, "\nextern \"C\" {\n");
Emit(&tables_file_, "\n");
}
diff --git a/system/ulib/fdio/fidl.cpp b/system/ulib/fdio/fidl.cpp
index 2c3028f..8ae989a 100644
--- a/system/ulib/fdio/fidl.cpp
+++ b/system/ulib/fdio/fidl.cpp
@@ -15,10 +15,10 @@
#include <zircon/syscalls.h>
#include <fbl/function.h>
-#include <fidl/cpp/builder.h>
-#include <fidl/cpp/message.h>
-#include <fidl/cpp/string_view.h>
-#include <fidl/cpp/vector_view.h>
+#include <lib/fidl/cpp/builder.h>
+#include <lib/fidl/cpp/message.h>
+#include <lib/fidl/cpp/string_view.h>
+#include <lib/fidl/cpp/vector_view.h>
#include <fdio/debug.h>
#include <fdio/io.fidl2.h>
#include <fdio/io.h>
diff --git a/system/ulib/fdio/include/fdio/io.fidl2.h b/system/ulib/fdio/include/fdio/io.fidl2.h
index afdd688..6d2fd2c 100644
--- a/system/ulib/fdio/include/fdio/io.fidl2.h
+++ b/system/ulib/fdio/include/fdio/io.fidl2.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <zircon/fidl.h>
#include <zircon/syscalls/object.h>
#include <zircon/types.h>
diff --git a/system/ulib/fidl/builder.cpp b/system/ulib/fidl/builder.cpp
index 241ea33..0fdb0a8 100644
--- a/system/ulib/fidl/builder.cpp
+++ b/system/ulib/fidl/builder.cpp
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/builder.h>
+#include <lib/fidl/cpp/builder.h>
#include <string.h>
-#include <fidl/internal.h>
+#include <lib/fidl/internal.h>
namespace fidl {
diff --git a/system/ulib/fidl/decoding.cpp b/system/ulib/fidl/decoding.cpp
index 0ec2d98..e11e39a 100644
--- a/system/ulib/fidl/decoding.cpp
+++ b/system/ulib/fidl/decoding.cpp
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <stdalign.h>
#include <stdint.h>
#include <stdlib.h>
-#include <fidl/internal.h>
+#include <lib/fidl/internal.h>
#include <zircon/assert.h>
#include <zircon/syscalls.h>
diff --git a/system/ulib/fidl/encoding.cpp b/system/ulib/fidl/encoding.cpp
index bc61bd4..1c64d19 100644
--- a/system/ulib/fidl/encoding.cpp
+++ b/system/ulib/fidl/encoding.cpp
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <stdalign.h>
#include <stdint.h>
#include <stdlib.h>
-#include <fidl/internal.h>
+#include <lib/fidl/internal.h>
#include <zircon/assert.h>
#include <zircon/syscalls.h>
diff --git a/system/ulib/fidl/include/fidl/coding.h b/system/ulib/fidl/include/lib/fidl/coding.h
similarity index 100%
rename from system/ulib/fidl/include/fidl/coding.h
rename to system/ulib/fidl/include/lib/fidl/coding.h
diff --git a/system/ulib/fidl/include/fidl/cpp/array.h b/system/ulib/fidl/include/lib/fidl/cpp/array.h
similarity index 100%
rename from system/ulib/fidl/include/fidl/cpp/array.h
rename to system/ulib/fidl/include/lib/fidl/cpp/array.h
diff --git a/system/ulib/fidl/include/fidl/cpp/builder.h b/system/ulib/fidl/include/lib/fidl/cpp/builder.h
similarity index 98%
rename from system/ulib/fidl/include/fidl/cpp/builder.h
rename to system/ulib/fidl/include/lib/fidl/cpp/builder.h
index 568443b..2302b79 100644
--- a/system/ulib/fidl/include/fidl/cpp/builder.h
+++ b/system/ulib/fidl/include/lib/fidl/cpp/builder.h
@@ -7,7 +7,7 @@
#include <stdalign.h>
#include <stdint.h>
-#include <fidl/cpp/message_part.h>
+#include <lib/fidl/cpp/message_part.h>
#include <zircon/compiler.h>
#include <zircon/fidl.h>
#include <zircon/types.h>
diff --git a/system/ulib/fidl/include/fidl/cpp/message.h b/system/ulib/fidl/include/lib/fidl/cpp/message.h
similarity index 98%
rename from system/ulib/fidl/include/fidl/cpp/message.h
rename to system/ulib/fidl/include/lib/fidl/cpp/message.h
index f0725ec..4fb59d1 100644
--- a/system/ulib/fidl/include/fidl/cpp/message.h
+++ b/system/ulib/fidl/include/lib/fidl/cpp/message.h
@@ -4,8 +4,8 @@
#pragma once
-#include <fidl/coding.h>
-#include <fidl/cpp/message_part.h>
+#include <lib/fidl/coding.h>
+#include <lib/fidl/cpp/message_part.h>
#include <zircon/fidl.h>
namespace fidl {
diff --git a/system/ulib/fidl/include/fidl/cpp/message_buffer.h b/system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
similarity index 95%
rename from system/ulib/fidl/include/fidl/cpp/message_buffer.h
rename to system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
index 5298164..7ae1d3b 100644
--- a/system/ulib/fidl/include/fidl/cpp/message_buffer.h
+++ b/system/ulib/fidl/include/lib/fidl/cpp/message_buffer.h
@@ -6,8 +6,8 @@
#include <stdint.h>
-#include <fidl/cpp/builder.h>
-#include <fidl/cpp/message.h>
+#include <lib/fidl/cpp/builder.h>
+#include <lib/fidl/cpp/message.h>
#include <zircon/fidl.h>
#include <zircon/types.h>
diff --git a/system/ulib/fidl/include/fidl/cpp/message_builder.h b/system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
similarity index 95%
rename from system/ulib/fidl/include/fidl/cpp/message_builder.h
rename to system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
index 900391d..0e0e101 100644
--- a/system/ulib/fidl/include/fidl/cpp/message_builder.h
+++ b/system/ulib/fidl/include/lib/fidl/cpp/message_builder.h
@@ -6,9 +6,9 @@
#include <stdint.h>
-#include <fidl/cpp/builder.h>
-#include <fidl/cpp/message_buffer.h>
-#include <fidl/cpp/message.h>
+#include <lib/fidl/cpp/builder.h>
+#include <lib/fidl/cpp/message_buffer.h>
+#include <lib/fidl/cpp/message.h>
#include <zircon/fidl.h>
#include <zircon/types.h>
diff --git a/system/ulib/fidl/include/fidl/cpp/message_part.h b/system/ulib/fidl/include/lib/fidl/cpp/message_part.h
similarity index 100%
rename from system/ulib/fidl/include/fidl/cpp/message_part.h
rename to system/ulib/fidl/include/lib/fidl/cpp/message_part.h
diff --git a/system/ulib/fidl/include/fidl/cpp/string_view.h b/system/ulib/fidl/include/lib/fidl/cpp/string_view.h
similarity index 100%
rename from system/ulib/fidl/include/fidl/cpp/string_view.h
rename to system/ulib/fidl/include/lib/fidl/cpp/string_view.h
diff --git a/system/ulib/fidl/include/fidl/cpp/vector_view.h b/system/ulib/fidl/include/lib/fidl/cpp/vector_view.h
similarity index 100%
rename from system/ulib/fidl/include/fidl/cpp/vector_view.h
rename to system/ulib/fidl/include/lib/fidl/cpp/vector_view.h
diff --git a/system/ulib/fidl/include/fidl/internal.h b/system/ulib/fidl/include/lib/fidl/internal.h
similarity index 99%
rename from system/ulib/fidl/include/fidl/internal.h
rename to system/ulib/fidl/include/lib/fidl/internal.h
index 0bbda86..18bb65c 100644
--- a/system/ulib/fidl/include/fidl/internal.h
+++ b/system/ulib/fidl/include/lib/fidl/internal.h
@@ -7,7 +7,7 @@
#include <assert.h>
#include <stdint.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <zircon/syscalls/object.h>
// All sizes here are given as uint32_t. Fidl message sizes are
diff --git a/system/ulib/fidl/message.cpp b/system/ulib/fidl/message.cpp
index 355bc07..87ab088 100644
--- a/system/ulib/fidl/message.cpp
+++ b/system/ulib/fidl/message.cpp
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/message.h>
+#include <lib/fidl/cpp/message.h>
#include <string.h>
-#include <fidl/coding.h>
-#include <fidl/cpp/builder.h>
+#include <lib/fidl/coding.h>
+#include <lib/fidl/cpp/builder.h>
#include <zircon/syscalls.h>
namespace fidl {
diff --git a/system/ulib/fidl/message_buffer.cpp b/system/ulib/fidl/message_buffer.cpp
index d71013f..9e95c945 100644
--- a/system/ulib/fidl/message_buffer.cpp
+++ b/system/ulib/fidl/message_buffer.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/message_buffer.h>
+#include <lib/fidl/cpp/message_buffer.h>
#include <stdlib.h>
diff --git a/system/ulib/fidl/message_builder.cpp b/system/ulib/fidl/message_builder.cpp
index 22997cf..c178690 100644
--- a/system/ulib/fidl/message_builder.cpp
+++ b/system/ulib/fidl/message_builder.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/message_builder.h>
+#include <lib/fidl/cpp/message_builder.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/system/ulib/fidl/validating.cpp b/system/ulib/fidl/validating.cpp
index 9e63707..827bec0 100644
--- a/system/ulib/fidl/validating.cpp
+++ b/system/ulib/fidl/validating.cpp
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <stdalign.h>
#include <stdint.h>
#include <stdlib.h>
-#include <fidl/internal.h>
+#include <lib/fidl/internal.h>
#include <zircon/assert.h>
// TODO(kulakowski) Design zx_status_t error values.
diff --git a/system/utest/fidl/abi_tests.cpp b/system/utest/fidl/abi_tests.cpp
index 5afc33e..0bd1a9b 100644
--- a/system/utest/fidl/abi_tests.cpp
+++ b/system/utest/fidl/abi_tests.cpp
@@ -4,8 +4,8 @@
#include <fbl/type_support.h>
-#include <fidl/coding.h>
-#include <fidl/internal.h>
+#include <lib/fidl/coding.h>
+#include <lib/fidl/internal.h>
namespace fidl {
namespace {
diff --git a/system/utest/fidl/cpp_types_tests.cpp b/system/utest/fidl/cpp_types_tests.cpp
index 9e17ac7..3dbdfe5 100644
--- a/system/utest/fidl/cpp_types_tests.cpp
+++ b/system/utest/fidl/cpp_types_tests.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/array.h>
-#include <fidl/cpp/builder.h>
-#include <fidl/cpp/string_view.h>
-#include <fidl/cpp/vector_view.h>
+#include <lib/fidl/cpp/array.h>
+#include <lib/fidl/cpp/builder.h>
+#include <lib/fidl/cpp/string_view.h>
+#include <lib/fidl/cpp/vector_view.h>
#include <unittest/unittest.h>
diff --git a/system/utest/fidl/decoding_tests.cpp b/system/utest/fidl/decoding_tests.cpp
index 4adc638..86da7b3 100644
--- a/system/utest/fidl/decoding_tests.cpp
+++ b/system/utest/fidl/decoding_tests.cpp
@@ -6,7 +6,7 @@
#include <fbl/type_support.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <unittest/unittest.h>
#include <zircon/syscalls.h>
diff --git a/system/utest/fidl/encoding_tests.cpp b/system/utest/fidl/encoding_tests.cpp
index 89d1839..06f6cfd 100644
--- a/system/utest/fidl/encoding_tests.cpp
+++ b/system/utest/fidl/encoding_tests.cpp
@@ -6,7 +6,7 @@
#include <fbl/type_support.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <unittest/unittest.h>
#include <zircon/syscalls.h>
diff --git a/system/utest/fidl/fidl_coded_types.cpp b/system/utest/fidl/fidl_coded_types.cpp
index fddbbcf..d1a735b 100644
--- a/system/utest/fidl/fidl_coded_types.cpp
+++ b/system/utest/fidl/fidl_coded_types.cpp
@@ -4,7 +4,7 @@
#include "fidl_coded_types.h"
-#include <fidl/internal.h>
+#include <lib/fidl/internal.h>
#include "fidl_structs.h"
diff --git a/system/utest/fidl/fidl_coded_types.h b/system/utest/fidl/fidl_coded_types.h
index e2d4abc..0bedd0b 100644
--- a/system/utest/fidl/fidl_coded_types.h
+++ b/system/utest/fidl/fidl_coded_types.h
@@ -4,7 +4,7 @@
#pragma once
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#if defined(__cplusplus)
extern "C" {
diff --git a/system/utest/fidl/fidl_structs.h b/system/utest/fidl/fidl_structs.h
index c852910..bdc14cf 100644
--- a/system/utest/fidl/fidl_structs.h
+++ b/system/utest/fidl/fidl_structs.h
@@ -7,7 +7,7 @@
#include <fbl/type_support.h>
#include <stdalign.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
// Handle types.
struct alignas(FIDL_ALIGNMENT) nonnullable_handle_inline_data {
diff --git a/system/utest/fidl/message_tests.cpp b/system/utest/fidl/message_tests.cpp
index e7f88d4..1452d1c 100644
--- a/system/utest/fidl/message_tests.cpp
+++ b/system/utest/fidl/message_tests.cpp
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <fidl/cpp/builder.h>
-#include <fidl/cpp/message_builder.h>
-#include <fidl/cpp/message.h>
-#include <fidl/cpp/string_view.h>
+#include <lib/fidl/cpp/builder.h>
+#include <lib/fidl/cpp/message_builder.h>
+#include <lib/fidl/cpp/message.h>
+#include <lib/fidl/cpp/string_view.h>
#include <zx/channel.h>
#include <zx/event.h>
diff --git a/system/utest/fidl/validating_tests.cpp b/system/utest/fidl/validating_tests.cpp
index b60663f..8f7fcbb 100644
--- a/system/utest/fidl/validating_tests.cpp
+++ b/system/utest/fidl/validating_tests.cpp
@@ -6,7 +6,7 @@
#include <fbl/type_support.h>
-#include <fidl/coding.h>
+#include <lib/fidl/coding.h>
#include <unittest/unittest.h>
