DescriptionGenerate gm/Android.mk, minus JSON.
When running gyp_to_android.py, generate the makefile for gm.
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
gm/gm_expectations.cpp:
gm/gm_expectations.h:
gm/gmmain.cpp:
Remove all json functionality when SK_BUILD_JSON_WRITER is not defined.
This flag is not defined when SK_BUILD_FOR_ANDROID is defined.
gyp/gm.gyp:
Depend on skia and cutils.
platform_tools/android/bin/gyp_to_android.py:
Generate gm/Android.mk.
platform_tools/android/gyp_gen/makefile_writer.py:
Build gm/Android.mk when building external/skia.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
BUG=skia:2448
Committed: http://code.google.com/p/skia/source/detail?r=14767
Patch Set 1 #
Total comments: 1
Patch Set 2 : Updates in response to https://codereview.chromium.org/282053002/ #Patch Set 3 : Remove generated files. #Patch Set 4 : Remove one more generated file #
Messages
Total messages: 5 (0 generated)
|