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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/base_nacl.gyp

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 | « base/base.gypi ('k') | base/base_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_nacl.gyp
diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp
index 63e1ed422bde1f695ff42276283b815877b77ffe..90a2893060a37efc2224b89a20384c15a6b484ce 100644
--- a/base/base_nacl.gyp
+++ b/base/base_nacl.gyp
@@ -7,8 +7,12 @@
'chromium_code': 1,
},
'includes': [
- '../build/common_untrusted.gypi',
+ # base.gypi must be included before common_untrusted.gypi.
+ #
+ # TODO(sergeyu): Replace the target_defaults magic in base.gypi with a
+ # sources variables lists. That way order of includes will not matter.
'base.gypi',
+ '../build/common_untrusted.gypi',
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
« no previous file with comments | « base/base.gypi ('k') | base/base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698