Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: tools/gn/build_settings.h

Issue 26561005: GYP generator for GN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/args.cc ('k') | tools/gn/build_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/build_settings.h
diff --git a/tools/gn/build_settings.h b/tools/gn/build_settings.h
index 7622057ceaf585ab2569d30755e31821d94dec2f..fc175dfe795167204e97b678c664a4b9df8bb93a 100644
--- a/tools/gn/build_settings.h
+++ b/tools/gn/build_settings.h
@@ -25,9 +25,9 @@ class OutputFile;
class BuildSettings {
public:
typedef base::Callback<void(const Target*)> TargetResolvedCallback;
- typedef std::multimap<Label, OutputFile> AdditionalLibsMap;
BuildSettings();
+ BuildSettings(const BuildSettings& other);
~BuildSettings();
// Absolute path of the source root on the local system. Everything is
@@ -106,18 +106,6 @@ class BuildSettings {
target_resolved_callback_ = cb;
}
- // When using_external_generator is set, this will be populated with
- // known linker dependencies for each target. The mapping is from .ninja
- // files to library (.a, .so, .dll, etc.) files needed by that target.
- //
- // When generating a GN binary that depends on some GYP-generated targets,
- // we need to know the GYP target's recursive set of libraries so we can in
- // turn link them into the final binary.
- AdditionalLibsMap& external_link_deps() { return external_link_deps_; }
- const AdditionalLibsMap& external_link_deps() const {
- return external_link_deps_;
- }
-
private:
base::FilePath root_path_;
std::string root_path_utf8_;
@@ -129,7 +117,6 @@ class BuildSettings {
SourceDir build_dir_;
std::string build_to_source_dir_string_;
Args build_args_;
- AdditionalLibsMap external_link_deps_;
TargetResolvedCallback target_resolved_callback_;
@@ -138,7 +125,7 @@ class BuildSettings {
mutable TargetManager target_manager_;
mutable ToolchainManager toolchain_manager_;
- DISALLOW_COPY_AND_ASSIGN(BuildSettings);
+ BuildSettings& operator=(const BuildSettings& other); // Disallow.
};
#endif // TOOLS_GN_BUILD_SETTINGS_H_
« no previous file with comments | « tools/gn/args.cc ('k') | tools/gn/build_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698