Multiple fixes to get BUILD.gn builds working again

Change-Id: I00c8050d85e25c4e926c06b4df1381434de92f34
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/24460
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
Ryan Harrison 2020-07-07 19:11:07 +00:00 committed by dan sinclair
parent 6453bee795
commit 7b819aa162
6 changed files with 31 additions and 5 deletions

View File

@ -493,7 +493,7 @@ source_set("libtint_msl_writer_src") {
]
configs += [ ":tint_common_config" ]
public_configs += [ ":tint_public_config" ]
public_configs = [ ":tint_public_config" ]
if (build_with_chromium) {
configs -= [ "//build/config/compiler:chromium_code" ]

10
DEPS
View File

@ -1,6 +1,16 @@
use_relative_paths = True
gclient_gn_args_file = 'build/config/gclient_args.gni'
gclient_gn_args = [
'mac_xcode_version',
]
vars = {
# This can be overridden, e.g. with custom_vars, to download a nonstandard
# Xcode version in build/mac_toolchain.py
# instead of downloading the prebuilt pinned revision.
'mac_xcode_version': 'default',
'chromium_git': 'https://chromium.googlesource.com',
'github': '/external/github.com',

View File

@ -32,6 +32,14 @@ bool Generator::Generate() {
return ret;
}
std::string Generator::result() const {
return impl_.result();
}
std::string Generator::error() const {
return impl_.error();
}
} // namespace msl
} // namespace writer
} // namespace tint

View File

@ -37,10 +37,10 @@ class Generator : public Text {
bool Generate() override;
/// @returns the result data
std::string result() const override { return impl_.result(); }
std::string result() const override;
/// @returns the error
std::string error() const { return impl_.error(); }
std::string error() const;
private:
GeneratorImpl impl_;

View File

@ -32,6 +32,14 @@ bool Generator::Generate() {
return ret;
}
std::string Generator::result() const {
return impl_.result();
}
std::string Generator::error() const {
return impl_.error();
}
} // namespace wgsl
} // namespace writer
} // namespace tint

View File

@ -37,10 +37,10 @@ class Generator : public Text {
bool Generate() override;
/// @returns the result data
std::string result() const override { return impl_.result(); }
std::string result() const override;
/// @returns the error
std::string error() const { return impl_.error(); }
std::string error() const;
private:
GeneratorImpl impl_;