gyp/etc1.gyp - Issue 1296253003: Depend on ETC1 via DEPS instead of a direct third_party checkin.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/etc1.gyp

Issue 1296253003: Depend on ETC1 via DEPS instead of a direct third_party checkin. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: gyp/etc1.gyp

diff --git a/gyp/etc1.gyp b/gyp/etc1.gyp

index f2eb69d98dfd7cef0d5f5789bff11c1e92e38b7b..08cf27fd85db5de9350cdfa828f3502ed6b066c6 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'

}],

« no previous file with comments | « DEPS ('k') | third_party/etc1/LICENSE » ('j') | no next file with comments »