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

Unified Diff: tools/gn/config_values.h

Issue 1530183005: Special-case paths that appear in libs by not prefixing them with -l. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo in previous patch Created 5 years 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/command_desc.cc ('k') | tools/gn/config_values_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/config_values.h
diff --git a/tools/gn/config_values.h b/tools/gn/config_values.h
index b6592cfcd04ccea828f436b8ce6b6e496af7e38b..823f1df9fc4b4a4f0359c8968a3d310e34790689 100644
--- a/tools/gn/config_values.h
+++ b/tools/gn/config_values.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/macros.h"
+#include "tools/gn/lib_file.h"
#include "tools/gn/source_dir.h"
#include "tools/gn/source_file.h"
@@ -39,12 +40,14 @@ class ConfigValues {
DIR_VALUES_ACCESSOR (include_dirs)
STRING_VALUES_ACCESSOR(ldflags)
DIR_VALUES_ACCESSOR (lib_dirs)
- STRING_VALUES_ACCESSOR(libs)
// If you add a new one, be sure to update AppendValues().
#undef STRING_VALUES_ACCESSOR
#undef DIR_VALUES_ACCESSOR
+ const std::vector<LibFile>& libs() const { return libs_; }
+ std::vector<LibFile>& libs() { return libs_; }
+
bool has_precompiled_headers() const {
return !precompiled_header_.empty() || !precompiled_source_.is_null();
}
@@ -72,7 +75,7 @@ class ConfigValues {
std::vector<SourceDir> include_dirs_;
std::vector<std::string> ldflags_;
std::vector<SourceDir> lib_dirs_;
- std::vector<std::string> libs_;
+ std::vector<LibFile> libs_;
// If you add a new one, be sure to update AppendValues().
std::string precompiled_header_;
« no previous file with comments | « tools/gn/command_desc.cc ('k') | tools/gn/config_values_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698