summaryrefslogtreecommitdiff
path: root/android_system.gyp
diff options
context:
space:
mode:
authorepoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-16 13:52:49 +0000
committerepoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-16 13:52:49 +0000
commitfc79bcf11ae67e538c55f5fb3239fcfea8b29115 (patch)
tree53ac01224f8483681c433856369f2009ebc2e5ff /android_system.gyp
parenta629ce2e87d003f6812bda7dbe6078d595be9897 (diff)
downloadgyp-fc79bcf11ae67e538c55f5fb3239fcfea8b29115.tar.gz
Make all gyp targets automatically include common.gypi
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too. Review URL: https://codereview.appspot.com/5820068 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'android_system.gyp')
-rw-r--r--android_system.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/android_system.gyp b/android_system.gyp
index 27a82f3..bbc1e69 100644
--- a/android_system.gyp
+++ b/android_system.gyp
@@ -15,7 +15,6 @@
# variable expansion step for gyp happens after the includes are processed.
{
'includes': [
- 'common.gypi',
'../../android/gyp/android.gypi',
],
-} \ No newline at end of file
+}