diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 18:27:44 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 18:27:44 +0000 |
| commit | 4d3f3cd4f26e5fa823a8d3b616fdcded59d11d70 (patch) | |
| tree | f380befdc894d48991357790a16d9baec7b78834 /gyp | |
| parent | 3cb834bd27a16cc60ff30adae96659558c2dc91f (diff) | |
Fix android build by removing references to the old sampleApp
Review URL: https://codereview.appspot.com/6949045
git-svn-id: http://skia.googlecode.com/svn/trunk@6786 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 2 | ||||
| -rw-r--r-- | gyp/android_system.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 8e8fec2fc7..9bc67c2de8 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -280,7 +280,7 @@ 'experimental.gyp:experimental', ], 'dependencies': [ - 'android_system.gyp:SampleAppAndroid', + 'android_deps.gyp:Android_EntryPoint', ], }], [ 'skia_gpu == 1', { diff --git a/gyp/android_system.gyp b/gyp/android_system.gyp index a2a9a0ab55..57f973a43f 100644 --- a/gyp/android_system.gyp +++ b/gyp/android_system.gyp @@ -15,6 +15,6 @@ # variable expansion step for gyp happens after the includes are processed. { 'includes': [ - '../../android/gyp/android.gypi', + '../../android/gyp/skia_android.gypi', ], } |