Chromium Code Reviews| Index: gyp/dng_sdk.gyp |
| diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp |
| index 1daebe1439576cce91db7a79d2a373d4c358003d..14a5b58f562477e9dfd8c0258289ebcfe8136f7b 100644 |
| --- a/gyp/dng_sdk.gyp |
| +++ b/gyp/dng_sdk.gyp |
| @@ -9,11 +9,11 @@ |
| 'type': 'none', |
| 'conditions': [ |
| [ 'skia_android_framework', { |
| - 'dependencies': [ 'android_deps.gyp:dng_sdk' ], |
| - 'export_dependent_settings': [ 'android_deps.gyp:dng_sdk' ], |
| + 'dependencies': [ 'android_deps.gyp:libdng_sdk' ], |
|
msarett
2016/01/25 19:24:39
Targets cannot have the same name.
|
| + 'export_dependent_settings': [ 'android_deps.gyp:libdng_sdk' ], |
| }, { |
| - 'dependencies': [ 'dng_sdk' ], |
| - 'export_dependent_settings': [ 'dng_sdk' ], |
| + 'dependencies': [ 'dng_sdk.gyp:dng_sdk' ], |
| + 'export_dependent_settings': [ 'dng_sdk.gyp:dng_sdk' ], |
| }] |
| ] |
| },{ |
| @@ -131,11 +131,11 @@ |
| ], |
| }, |
| 'dependencies': [ |
| - 'libjpeg-turbo.gyp:libjpeg-turbo', |
| + 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
| 'zlib.gyp:zlib', |
| ], |
| 'export_dependent_settings': [ |
| - 'libjpeg-turbo.gyp:libjpeg-turbo', |
| + 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
|
msarett
2016/01/25 19:24:39
Need to include the selector.
scroggo
2016/01/26 13:28:58
I'm surprised - I thought this was okay because th
msarett
2016/01/26 14:30:41
Yeah this *should* be ok.
AFAICT, the issue is th
|
| 'zlib.gyp:zlib', |
| ], |
| 'direct_dependent_settings': { |