Fix gyp files so that gyp_to_Android.mk succeeds

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

Committed: https://skia.googlesource.com/skia/+/7869bbff26b75a34ff8f56c9dfdaa98476adb6cb

[msarett, 2016-01-25 19:23:01]

Description was changed from

==========
Fix gyp files so that gyp_to_Android.mk succeeds

BUG=skia:
==========

to

==========
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&is...
==========

[msarett, 2016-01-25 19:24:39]

msarett@google.com changed reviewers:
+ adaubert@google.com, djsollen@google.com

[msarett, 2016-01-25 19:24:40]

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp
File gyp/dng_sdk.gyp (right):

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode12
gyp/dng_sdk.gyp:12: 'dependencies': [ 'android_deps.gyp:libdng_sdk' ],
Targets cannot have the same name.

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode138
gyp/dng_sdk.gyp:138: 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
Need to include the selector.

[adaubert, 2016-01-25 19:27:20]

On 2016/01/25 19:24:40, msarett wrote:
> https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp
> File gyp/dng_sdk.gyp (right):
> 
> https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode12
> gyp/dng_sdk.gyp:12: 'dependencies': [ 'android_deps.gyp:libdng_sdk' ],
> Targets cannot have the same name.
> 
> https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode138
> gyp/dng_sdk.gyp:138: 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
> Need to include the selector.

LGTM

[msarett, 2016-01-25 19:27:51]

The CQ bit was checked by msarett@google.com

[commit-bot: I haz the power, 2016-01-25 19:28:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1630723003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1630723003/1

[commit-bot: I haz the power, 2016-01-25 19:40:04]

Description was changed from

==========
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&is...
==========

to

==========
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&is...

Committed:
https://skia.googlesource.com/skia/+/7869bbff26b75a34ff8f56c9dfdaa98476adb6cb
==========

[commit-bot: I haz the power, 2016-01-25 19:40:04]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/7869bbff26b75a34ff8f56c9dfdaa98476adb6cb

[scroggo, 2016-01-26 13:28:58]

scroggo@google.com changed reviewers:
+ scroggo@google.com

[scroggo, 2016-01-26 13:28:58]

lgtm

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp
File gyp/dng_sdk.gyp (right):

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode138
gyp/dng_sdk.gyp:138: 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
On 2016/01/25 19:24:39, msarett wrote:
> Need to include the selector.

I'm surprised - I thought this was okay because this is only used when
!skia_build_for_android_framework, so it made sense to me that we could pick the
one that is used under that condition.

[msarett, 2016-01-26 14:30:42]

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp
File gyp/dng_sdk.gyp (right):

https://codereview.chromium.org/1630723003/diff/1/gyp/dng_sdk.gyp#newcode138
gyp/dng_sdk.gyp:138: 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
On 2016/01/26 13:28:58, scroggo wrote:
> On 2016/01/25 19:24:39, msarett wrote:
> > Need to include the selector.
> 
> I'm surprised - I thought this was okay because this is only used when
> !skia_build_for_android_framework, so it made sense to me that we could pick
the
> one that is used under that condition.

Yeah this *should* be ok.

AFAICT, the issue is that (if we don't include the extra indirection),
gyp_to_android.py will attempt to parse libjpeg-turbo.gyp and will fail when
"host_os" is not defined.