From b52cf3dd95b3d3e7445ac9b82560317c296daa42 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 5 Jun 2012 17:57:48 +0000 Subject: 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 --- gyp/SampleApp.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gyp') 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', ], }], ], -- cgit v1.2.3