.gyp files for ANGLE interface

.gyp files for ANGLE interface

These are the .gyp files required to get the ANGLE GL interface working. From http://codereview.appspot.com/5940046/ here are all the known problems with the .gyps

1) although the SK_MESA flag is only added in common.gypi I found this wasn't sufficient and also needed to add a 'defines' block to common_conditions.gypi.
2) I don't know how to attach ANGLE to Skia correctly so currently have hard paths to the ANGLE libs I (manually) copied to third_party/externals/angle.
3) For some reason the 'libraries' and 'include_dirs' settings in gpu.gyp weren't propagating to the executables so I replicated these blocks in bench.gypi, tests.gyp, gm.gyp and SampleApp.gyp.

[robertphillips, 2012-04-02 12:58:47]

Here are the updated .gyp files. There is a bit of noise in the diffs since the
.gyp files have been changing in the base.

[robertphillips, 2012-04-02 12:59:37]

On 2012/04/02 12:58:47, robertphillips wrote:
> Here are the updated .gyp files. There is a bit of noise in the diffs since
the
> .gyp files have been changing in the base.

The only remaining issue I know of is to alter angle.gyp to work with both debug
and release.

[bsalomon, 2012-04-02 13:16:33]

On 2012/04/02 12:59:37, robertphillips wrote:
> On 2012/04/02 12:58:47, robertphillips wrote:
> > Here are the updated .gyp files. There is a bit of noise in the diffs since
> the
> > .gyp files have been changing in the base.
> 
> The only remaining issue I know of is to alter angle.gyp to work with both
debug
> and release.

LGTM

[epoger, 2012-04-02 14:05:51]

Almost there... let me know if you'd like to discuss any of these remaining
issues live...

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode4
gyp/gpu.gyp:4: [ 'skia_angle', {
I'm pretty sure this isn't needed, as long as all targets in this file depend on
angle.gyp.

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode58
gyp/gpu.gyp:58: [ 'skia_angle', {
I believe this isn't needed, as long as all targets in this file
export_dependent_settings on angle.gyp

http://codereview.appspot.com/5933057/diff/11002/gyp/views.gyp
File gyp/views.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/views.gyp#newcode21
gyp/views.gyp:21: '../third_party/externals/angle/include'
Instead, views.gyp should depend on angle.gyp to pick this up.

[robertphillips, 2012-04-02 15:25:59]

Two out of the three simplifications worked. I don't know why the include_dirs
in gpu.gyp is still required.

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode4
gyp/gpu.gyp:4: [ 'skia_angle', {
Removing this prevents the compiler from finding the ANGLE headers.

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode58
gyp/gpu.gyp:58: [ 'skia_angle', {
On 2012/04/02 14:05:51, epoger wrote:
> I believe this isn't needed, as long as all targets in this file
> export_dependent_settings on angle.gyp

Done.

http://codereview.appspot.com/5933057/diff/11002/gyp/views.gyp
File gyp/views.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/views.gyp#newcode21
gyp/views.gyp:21: '../third_party/externals/angle/include'
On 2012/04/02 14:05:51, epoger wrote:
> Instead, views.gyp should depend on angle.gyp to pick this up.

Done.

http://codereview.appspot.com/5933057/diff/13002/gyp/views.gyp
File gyp/views.gyp (right):

http://codereview.appspot.com/5933057/diff/13002/gyp/views.gyp#newcode21
gyp/views.gyp:21: '../include/gpu',
Added gpu include path to match recent code delivery (r3571) to remove namespace
requirement from ANGLE

[epoger, 2012-04-02 17:26:06]

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode4
gyp/gpu.gyp:4: [ 'skia_angle', {
On 2012/04/02 15:26:00, robertphillips wrote:
> Removing this prevents the compiler from finding the ANGLE headers.

I suspect that this is because the skgr target does not depend on angle.gyp. 
Please try adding that (both 'dependencies' and 'export_dependent_settings') and
removing this.

http://codereview.appspot.com/5933057/diff/13002/gyp/common_variables.gypi
File gyp/common_variables.gypi (right):

http://codereview.appspot.com/5933057/diff/13002/gyp/common_variables.gypi#ne...
gyp/common_variables.gypi:65: 'skia_angle%': 1,
looks like skia_angle got turned back on by default

[robertphillips, 2012-04-02 20:34:20]

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp
File gyp/gpu.gyp (right):

http://codereview.appspot.com/5933057/diff/11002/gyp/gpu.gyp#newcode4
gyp/gpu.gyp:4: [ 'skia_angle', {
That did the trick

http://codereview.appspot.com/5933057/diff/13002/gyp/common_variables.gypi
File gyp/common_variables.gypi (right):

http://codereview.appspot.com/5933057/diff/13002/gyp/common_variables.gypi#ne...
gyp/common_variables.gypi:65: 'skia_angle%': 1,
On 2012/04/02 17:26:07, epoger wrote:
> looks like skia_angle got turned back on by default

Done.

[epoger, 2012-04-02 20:35:17]

LGTM !!!!

Thanks for taking the time to get this right!

[robertphillips, 2012-04-02 21:00:33]

committed as r3580