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

Unified Diff: tools/gn/target.cc

Issue 275703003: Make GN Android build link executables (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
« build/config/android/config.gni ('K') | « tools/gn/settings.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/target.cc
diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index b6845d03de6698cd96ccc07f2f9e4ac3678d2a31..ac1a9eb6116bc4ffa5656614c7fd006d804c9f29 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -211,7 +211,13 @@ void Target::PullRecursiveHardDeps() {
const Target* dep = deps_[dep_i].ptr;
if (dep->hard_dep())
recursive_hard_deps_.insert(dep);
- recursive_hard_deps_.insert(dep->recursive_hard_deps().begin(),
- dep->recursive_hard_deps().end());
+
+ // Android STL doesn't like insert(begin, end) so do it manually.
+ // TODO(brettw) this can be changed to insert(dep->begin(), dep->end()) when
+ // Android uses a better STL.
+ for (std::set<const Target*>::const_iterator cur =
+ dep->recursive_hard_deps().begin();
+ cur != dep->recursive_hard_deps().end(); ++cur)
+ recursive_hard_deps_.insert(*cur);
}
}
« build/config/android/config.gni ('K') | « tools/gn/settings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698