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

Unified Diff: tools/gn/target.cc

Issue 1606553002: Add support for Mac/iOS application bundles to GN tool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: base_unittests builds and pass all tests with GN Created 4 years, 11 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
Index: tools/gn/target.cc
diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index 49a22fcbd8c4289e14623ebe2d39e8f68325f0a2..6917edf34b88cd1f119bb6859268233465c7226a 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -138,6 +138,8 @@ const char* Target::GetStringForOutputType(OutputType type) {
return "Source set";
case COPY_FILES:
return "Copy";
+ case COPY_BUNDLE_DATA:
+ return "Copy bundle data";
case ACTION:
return "Action";
case ACTION_FOREACH:
@@ -193,6 +195,10 @@ bool Target::OnResolved(Err* err) {
const ConfigValues& cur = iter.cur();
all_lib_dirs_.append(cur.lib_dirs().begin(), cur.lib_dirs().end());
all_libs_.append(cur.libs().begin(), cur.libs().end());
+ if (output_type_ == COPY_BUNDLE_DATA) {
+ sources_.insert(
+ sources_.end(), cur.bundle_data().begin(), cur.bundle_data().end());
+ }
}
PullDependentTargetLibs();
@@ -226,6 +232,7 @@ bool Target::IsFinal() const {
output_type_ == ACTION ||
output_type_ == ACTION_FOREACH ||
output_type_ == COPY_FILES ||
+ output_type_ == COPY_BUNDLE_DATA ||
(output_type_ == STATIC_LIBRARY && complete_static_lib_);
}
@@ -363,6 +370,7 @@ void Target::FillOutputFiles() {
case GROUP:
case SOURCE_SET:
case COPY_FILES:
+ case COPY_BUNDLE_DATA:
case ACTION:
case ACTION_FOREACH: {
// These don't get linked to and use stamps which should be the first
« tools/gn/target.h ('K') | « tools/gn/target.h ('k') | tools/gn/target_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698