From 7869bbff26b75a34ff8f56c9dfdaa98476adb6cb Mon Sep 17 00:00:00 2001 From: msarett Date: Mon, 25 Jan 2016 11:40:02 -0800 Subject: [PATCH] Fix gyp files so that gyp_to_Android.mk succeeds BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1630723003 Review URL: https://codereview.chromium.org/1630723003 --- gyp/android_deps.gyp | 4 ++-- gyp/dng_sdk.gyp | 12 ++++++------ gyp/piex.gyp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp index 1a0c758..1a8d81b 100644 --- a/gyp/android_deps.gyp +++ b/gyp/android_deps.gyp @@ -64,7 +64,7 @@ }, }, { - 'target_name': 'dng_sdk', + 'target_name': 'libdng_sdk', 'type': 'none', 'direct_dependent_settings': { 'libraries' : [ @@ -76,7 +76,7 @@ }, }, { - 'target_name': 'piex', + 'target_name': 'libpiex', 'type': 'none', 'direct_dependent_settings': { 'libraries' : [ diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index 1daebe1..14a5b58 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' ], + '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', 'zlib.gyp:zlib', ], 'direct_dependent_settings': { diff --git a/gyp/piex.gyp b/gyp/piex.gyp index c59dc69..7822cd5 100644 --- a/gyp/piex.gyp +++ b/gyp/piex.gyp @@ -17,11 +17,11 @@ 'type': 'none', 'conditions': [ [ 'skia_android_framework', { - 'dependencies': [ 'android_deps.gyp:piex' ], - 'export_dependent_settings': [ 'android_deps.gyp:piex' ], + 'dependencies': [ 'android_deps.gyp:libpiex' ], + 'export_dependent_settings': [ 'android_deps.gyp:libpiex' ], }, { - 'dependencies': [ 'piex' ], - 'export_dependent_settings': [ 'piex' ], + 'dependencies': [ 'piex.gyp:piex' ], + 'export_dependent_settings': [ 'piex.gyp:piex' ], }] ] },{ -- 2.7.4