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

Unified Diff: base/base.gyp

Issue 1855483004: [iOS/OS X] Allow base::scoped_nsobject<> to be used when ARC is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to build/config/compiler/BUILD.gn Created 4 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/BUILD.gn ('k') | base/base.gypi » ('j') | base/mac/scoped_block.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index d1e7bd099b0daf4d1565d833388d2432f319992b..a502674ac2a068105d3b693086dff862272d2517 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -221,6 +221,10 @@
'$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
],
},
+ 'sources/': [
+ ['include', '^mac/scoped_block\\.mm$'],
+ ['include', '^mac/scoped_nsobject\\.mm$'],
+ ],
}],
['OS != "win" and (OS != "ios" or _toolset == "host")', {
'dependencies': ['third_party/libevent/libevent.gyp:libevent'],
« no previous file with comments | « base/BUILD.gn ('k') | base/base.gypi » ('j') | base/mac/scoped_block.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698