aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-08-17 10:20:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-17 10:20:16 -0700
commitca01d179347b5e848ded97c8228b79ffc6b5e7bf (patch)
tree8a4625ec6c46624bed5f71ef2b0b4358d2ef3d7f /gyp
parent6a91ad22a41cd5f5677d9adbfec851f6464f3f0e (diff)
Depend on ETC1 via DEPS instead of a direct third_party checkin.
Yes, this does mean we'll check out ~40M of code for 2 files... I think these trybots are moot... they gclient sync before patching. BUG=skia: Review URL: https://codereview.chromium.org/1296253003
Diffstat (limited to 'gyp')
-rw-r--r--gyp/etc1.gyp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gyp/etc1.gyp b/gyp/etc1.gyp
index f2eb69d98d..08cf27fd85 100644
--- a/gyp/etc1.gyp
+++ b/gyp/etc1.gyp
@@ -11,14 +11,14 @@
'target_name': 'libetc1',
'type': 'static_library',
'include_dirs' : [
- '../third_party/etc1'
+ '../third_party/externals/android_native/opengl/include/'
],
'sources': [
- '../third_party/etc1/etc1.cpp',
+ '../third_party/externals/android_native/opengl/libs/ETC1/etc1.cpp'
],
'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/etc1',
+ 'include_dirs' : [
+ '../third_party/externals/android_native/opengl/include/ETC1'
],
},
}],