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

Unified Diff: gyp/common.gypi

Issue 154053002: Reland "Gyp file changes for the android framework." (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fix android build. Created 6 years, 10 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 | « gyp/android_framework_lib.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common.gypi
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 48b9a6d2ef0dbc3f8f6e2676fb246d3053dbde2d..2a5bbd493e216bdd6009e8c58857076c3265a8d7 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -88,25 +88,30 @@
],
},
],
+ [ 'skia_android_framework==0', {
+ # These defines are not used for skia_android_framework, where we build
+ # one makefile and allow someone to add SK_DEBUG etc for their own
+ # debugging purposes.
+ 'configurations': {
+ 'Debug': {
+ 'defines': [
+ 'SK_DEBUG',
+ 'SK_DEVELOPER=1',
+ ],
+ },
+ 'Release': {
+ 'defines': [
+ 'SK_RELEASE',
+ ],
+ },
+ 'Release_Developer': {
+ 'inherit_from': ['Release'],
+ 'defines': [
+ 'SK_DEVELOPER=1',
+ ],
+ },
+ },
+ }],
],
- 'configurations': {
- 'Debug': {
- 'defines': [
- 'SK_DEBUG',
- 'SK_DEVELOPER=1',
- ],
- },
- 'Release': {
- 'defines': [
- 'SK_RELEASE',
- ],
- },
- 'Release_Developer': {
- 'inherit_from': ['Release'],
- 'defines': [
- 'SK_DEVELOPER=1',
- ],
- },
- },
}, # end 'target_defaults'
}
« no previous file with comments | « gyp/android_framework_lib.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698