Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / tools / gn / binary_target_generator.cc

diff --git a/src/tools/gn/binary_target_generator.cc b/src/tools/gn/binary_target_generator.cc
index 73f7cd2..deee216 100644 (file)
--- a/src/tools/gn/binary_target_generator.cc
+++ b/src/tools/gn/binary_target_generator.cc
@@ -118,18 +118,17 @@ bool BinaryTargetGenerator::FillAllowCircularIncludesFrom() {
     return false;
 
   // Validate that all circular includes entries are in the deps.
-  for (size_t circular_i = 0; circular_i < circular.size(); circular_i++) {
+  for (const auto& cur : circular) {
     bool found_dep = false;
-    for (DepsIterator iter(target_, DepsIterator::LINKED_ONLY);
-         !iter.done(); iter.Advance()) {
-      if (iter.label() == circular[circular_i]) {
+    for (const auto& dep_pair : target_->GetDeps(Target::DEPS_LINKED)) {
+      if (dep_pair.label == cur) {
         found_dep = true;
         break;
       }
     }
     if (!found_dep) {
       *err_ = Err(*value, "Label not in deps.",
-          "The label \"" + circular[circular_i].GetUserVisibleName(false) +
+          "The label \"" + cur.GetUserVisibleName(false) +
           "\"\nwas not in the deps of this target. "
           "allow_circular_includes_from only allows\ntargets present in the "
           "deps.");
@@ -138,7 +137,7 @@ bool BinaryTargetGenerator::FillAllowCircularIncludesFrom() {
   }
 
   // Add to the set.
-  for (size_t i = 0; i < circular.size(); i++)
-    target_->allow_circular_includes_from().insert(circular[i]);
+  for (const auto& cur : circular)
+    target_->allow_circular_includes_from().insert(cur);
   return true;
 }