diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-05 17:57:48 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-05 17:57:48 +0000 |
| commit | b52cf3dd95b3d3e7445ac9b82560317c296daa42 (patch) | |
| tree | 8d49ccb21c7c449442533c404b9a8ea5c6be1d64 /gyp | |
| parent | b83f7978d7bc23b35e9ba3738e82a0ad4a02e7e5 (diff) | |
Support Mac-Android Cross-Compilation
- Rename Android sampleApp target to SampleAppAndroid to avoid name collision
- Detect skia_os on Darwin to differentiate between xcode and make builds
Review URL: https://codereview.appspot.com/6303044
git-svn-id: http://skia.googlecode.com/svn/trunk@4168 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index c426508ebc..fd41f00773 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -252,7 +252,7 @@ 'experimental.gyp:experimental', ], 'dependencies': [ - 'android_system.gyp:sampleApp', + 'android_system.gyp:SampleAppAndroid', ], }], ], |