Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Don't generate zx fidl headers and source. #543

Merged
chandarrengoog merged 1 commit into from
Jan 13, 2022
Merged

Don't generate zx fidl headers and source. #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions build/fuchsia/fidl_gen_cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,19 @@ def main():
parser = argparse.ArgumentParser();

parser.add_argument('--fidlc-bin', dest='fidlc_bin', action='store', required=True)
parser.add_argument('--fidlgen-bin', dest='fidlgen_bin', action='store', required=True)
parser.add_argument('--fidlgen-bin', dest='fidlgen_bin', action='store', required=False)

parser.add_argument('--sdk-base', dest='sdk_base', action='store', required=True)
parser.add_argument('--root', dest='root', action='store', required=True)
parser.add_argument('--json', dest='json', action='store', required=True)
parser.add_argument('--fidlgen-root', dest='fidlgen_root', action='store', required=True)
parser.add_argument('--fidlgen-output-root', dest='fidlgen_output_root', action='store', required=False)
Copy link
Copy Markdown
Contributor

@akbiggs akbiggs Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No action required, but it seems weird that fidlgen_bin is always required even though it won't be used when fidlgen_output_root is not set.

Copy link
Copy Markdown
Contributor Author

@chandarrengoog chandarrengoog Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noted. I've changed the code to consider this.

parser.add_argument('--output-c-tables', dest='output_c_tables', action='store', required=True)

args = parser.parse_args()

assert os.path.exists(args.fidlc_bin)
assert os.path.exists(args.fidlgen_bin)
# --fidlgen-bin and --fidlgen-output-root should be passed in together.
assert os.path.exists(args.fidlgen_bin or '') == bool(args.fidlgen_output_root)

fidl_files_by_name = GetFIDLFilesByLibraryName(args.sdk_base, args.root)

Expand All @@ -72,19 +73,19 @@ def main():
fidl_abspath = os.path.abspath('%s/%s' % (args.sdk_base, fidl_file))
fidlc_command.append(fidl_abspath)

subprocess.check_call(fidlc_command);
subprocess.check_call(fidlc_command)

assert os.path.exists(args.json)
if args.fidlgen_output_root:
assert os.path.exists(args.json)
fidlgen_command = [
args.fidlgen_bin,
'-json',
args.json,
'-root',
args.fidlgen_output_root
]

fidlgen_command = [
args.fidlgen_bin,
'-json',
args.json,
'-root',
args.fidlgen_root
]

subprocess.check_call(fidlgen_command)
subprocess.check_call(fidlgen_command)

return 0

Expand Down
73 changes: 35 additions & 38 deletions build/fuchsia/sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,30 +103,33 @@ template("_fuchsia_fidl_library") {
outputs = [
"$target_gen_dir/$library_name_slashes/cpp/tables.c",
]
# TODO(https://fxbug.dev/90838): Make zx library less special-cased.
if (library_name != "zx") {
outputs += [
"$target_gen_dir/$library_name_slashes/cpp/fidl.h",
"$target_gen_dir/$library_name_slashes/cpp/fidl.cc",
]
}

args = [
"--fidlc-bin",
rebase_path("$_fuchsia_sdk_path/tools/fidlc"),
"--fidlgen-bin",
rebase_path("$_fuchsia_sdk_path/tools/fidlgen"),
"--sdk-base",
rebase_path(_fuchsia_sdk_path),
"--root",
rebase_path(invoker.meta),
"--json",
rebase_path("$target_gen_dir/$library_name_json"),
"--fidlgen-root",
rebase_path("$target_gen_dir"),
"--output-c-tables",
rebase_path("$target_gen_dir/$library_name_slashes/cpp/tables.c"),
]

if (!defined(invoker.only_generate_tables) || !invoker.only_generate_tables) {
outputs += [
"$target_gen_dir/$library_name_slashes/cpp/fidl.h",
"$target_gen_dir/$library_name_slashes/cpp/fidl.cc",
]

args += [
"--fidlgen-bin",
rebase_path("$_fuchsia_sdk_path/tools/fidlgen"),
"--fidlgen-output-root",
rebase_path("$target_gen_dir"),
]
}
}

source_set(target_name) {
Expand Down Expand Up @@ -243,35 +246,29 @@ template("fuchsia_sdk") {

part_meta_json = read_file(part_meta_rebased, "json")

# version_history.json does not have a name and thus fails when we try to read it.
if (part_meta != "version_history.json") {
# Check if `part.type` is in `invoker.enabled_parts`.
if (invoker.enabled_parts + [part.type] - [part.type] != invoker.enabled_parts) {
subtarget_name = part_meta_json.name

foreach(enabled_part, invoker.enabled_parts) {
if (part.type == "cc_source_library") {
if (part.type == enabled_part) {
_fuchsia_cc_source_library(subtarget_name) {
meta = part_meta_rebased
}
}
} else if (part.type == "sysroot") {
if (part.type == enabled_part) {
_fuchsia_sysroot(subtarget_name) {
meta = part_meta_rebased
}
}
} else if (part.type == "fidl_library") {
if (part.type == enabled_part) {
_fuchsia_fidl_library(subtarget_name) {
meta = part_meta_rebased
}
}
} else if (part.type == "cc_prebuilt_library") {
if (part.type == enabled_part) {
_fuchsia_cc_prebuilt_library(subtarget_name) {
meta = part_meta_rebased
}
}
if (part.type == "cc_source_library") {
_fuchsia_cc_source_library(subtarget_name) {
meta = part_meta_rebased
}
} else if (part.type == "sysroot") {
_fuchsia_sysroot(subtarget_name) {
meta = part_meta_rebased
}
} else if (part.type == "fidl_library") {
_fuchsia_fidl_library(subtarget_name) {
meta = part_meta_rebased

# TODO(fxbug.dev/90838): Remove the zx special-case when generic
# option is available.
only_generate_tables = subtarget_name == "zx"
}
} else if (part.type == "cc_prebuilt_library") {
_fuchsia_cc_prebuilt_library(subtarget_name) {
meta = part_meta_rebased
}
}
}
Expand Down