Ensure that skia's test resources are properly packaged on Android

Ensure that skia's test resources are properly packaged on Android

Committed: https://skia.googlesource.com/skia/+/f056bd1e01078c02b35d00c22d55ef52b017ef7f

[djsollen, 2015-02-23 18:36:20]

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

[scroggo, 2015-02-23 18:52:16]

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
File platform_tools/android/gyp_gen/tool_makefile_writer.py (right):

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:17: SKIA_RESOURCES = (
I thought you had decided to create a separate target for this?

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:26: skia_resources_dir :=
What does this line do? Prevent skia_resources_dir from being used later?

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:47:
f.write(SKIA_RESOURCES)
We have some tests that make sure the makefile writer didn't change
unexpectedly. In order to update them, you'll need to run something like:

python platform_tools/android/tests/makefile_writer_tests.py --rebaseline

[djsollen, 2015-02-23 19:04:47]

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
File platform_tools/android/gyp_gen/tool_makefile_writer.py (right):

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:17: SKIA_RESOURCES = (
On 2015/02/23 18:52:16, scroggo wrote:
> I thought you had decided to create a separate target for this?

It was a good idea, but the execution didn't work out.

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:26: skia_resources_dir :=
On 2015/02/23 18:52:16, scroggo wrote:
> What does this line do? Prevent skia_resources_dir from being used later?

Yes, it basically nulls out the value since it won't be cleared by the standard
CLEAR_VARS command

https://codereview.chromium.org/949853003/diff/1/platform_tools/android/gyp_g...
platform_tools/android/gyp_gen/tool_makefile_writer.py:47:
f.write(SKIA_RESOURCES)
On 2015/02/23 18:52:16, scroggo wrote:
> We have some tests that make sure the makefile writer didn't change
> unexpectedly. In order to update them, you'll need to run something like:
> 
> python platform_tools/android/tests/makefile_writer_tests.py --rebaseline

Acknowledged.

[scroggo, 2015-02-23 19:14:58]

lgtm

[djsollen, 2015-02-23 19:18:36]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2015-02-23 19:18:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/949853003/20001

[commit-bot: I haz the power, 2015-02-23 19:18:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-23 19:18:54]

Presubmit check for 949853003-20001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Pylint (platform_tools/android/gyp_gen/tool_makefile_writer.py) (0.73s) failed
************* Module gyp_gen.tool_makefile_writer
C: 21, 0: Line too long (81/80) (line-too-long)


Presubmit checks took 1.3s to calculate.

[djsollen, 2015-02-23 20:17:51]

The CQ bit was checked by djsollen@google.com

[djsollen, 2015-02-23 20:17:52]

The patchset sent to the CQ was uploaded after l-g-t-m from scroggo@google.com
Link to the patchset: https://codereview.chromium.org/949853003/#ps40001 (title:
" ")

[commit-bot: I haz the power, 2015-02-23 20:18:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/949853003/40001

[commit-bot: I haz the power, 2015-02-23 20:37:36]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/f056bd1e01078c02b35d00c22d55ef52b017ef7f