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

Unified Diff: base/base.gypi

Issue 7480016: Add AutoJObject and AutoGlobalJObject (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed nits Created 9 years, 4 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/android/scoped_java_reference.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index c35b344c81e54ba7f449f7ec8d7d6f0d0890c7d2..4af757d22c6262a3579d78ba699b4a4621b26b34 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -19,6 +19,8 @@
'third_party/icu/icu_utf.h',
'third_party/nspr/prtime.cc',
'third_party/nspr/prtime.h',
+ 'android/scoped_java_global_reference.h',
+ 'android/scoped_java_reference.h',
'at_exit.cc',
'at_exit.h',
'atomic_ref_count.h',
@@ -410,6 +412,10 @@
'sources/': [ ['exclude', '^win/'] ],
},
],
+ ['OS != "android"', {
+ 'sources/': [ ['exclude', '^android/'] ],
+ },
+ ],
[ 'OS == "win"', {
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
« no previous file with comments | « base/android/scoped_java_reference.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698