Generate gm/Android.mk, minus JSON.

gm/Android.mk

Index: gm/Android.mk
diff --git a/gm/Android.mk b/gm/Android.mk
index e7a4ca145fcf9be7d213bed11e9ef80adaf4c7bc..c112c2dc3b20f88ea24eb1e95c9f17faefc494a5 100644
--- a/gm/Android.mk
+++ b/gm/Android.mk
@@ -1,190 +1,224 @@
 
+###############################################################################
+#
+# THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
+#
+###############################################################################
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
+LOCAL_CFLAGS += \
+	-Wno-unused-parameter \
+	-U_FORTIFY_SOURCE \
+	-D_FORTIFY_SOURCE=1
 
 LOCAL_SRC_FILES := \
-  gm.cpp \
-  gmmain.cpp \
-  system_preferences_default.cpp \
-  ../src/pipe/utils/SamplePipeControllers.cpp \
-  ../src/utils/debugger/SkDrawCommand.cpp \
-  ../src/utils/debugger/SkDebugCanvas.cpp \
-  ../src/utils/debugger/SkObjectParser.cpp
-
-
-# Slides
-LOCAL_SRC_FILES += \
-  aaclip.cpp \
-  aarectmodes.cpp \
-  alphagradients.cpp \
-  androidfallback.cpp \
-  arcofzorro.cpp \
-  arithmode.cpp \
-  beziereffects.cpp \
-  bicubicfilter.cpp \
-  bigblurs.cpp \
-  bigmatrix.cpp \
-  bigtext.cpp \
-  bitmapalphathreshold.cpp \
-  bitmapcopy.cpp \
-  bitmapmatrix.cpp \
-  bitmapfilters.cpp \
-  bitmappremul.cpp \
-  bitmaprect.cpp \
-  bitmaprecttest.cpp \
-  bitmapscroll.cpp \
-  bitmapshader.cpp \
-  bitmapsource.cpp \
-  bleed.cpp \
-  blurs.cpp \
-  blurquickreject.cpp \
-  blurrect.cpp \
-  blurroundrect.cpp \
-  canvasstate.cpp \
-  circles.cpp \
-  circularclips.cpp \
-  clippedbitmapshaders.cpp \
-  coloremoji.cpp \
-  colorfilterimagefilter.cpp \
-  colormatrix.cpp \
-  colortype.cpp \
-  complexclip.cpp \
-  complexclip2.cpp \
-  composeshader.cpp \
-  convexpaths.cpp \
-  copyTo4444.cpp \
-  cubicpaths.cpp \
-  cmykjpeg.cpp \
-  degeneratesegments.cpp \
-  dashcubics.cpp \
-  dashing.cpp \
-  deviceproperties.cpp \
-  distantclip.cpp \
-  displacement.cpp \
-  downsamplebitmap.cpp \
-  drawbitmaprect.cpp \
-  drawlooper.cpp \
-  dropshadowimagefilter.cpp \
-  extractbitmap.cpp \
-  emptypath.cpp \
-  fatpathfill.cpp \
-  factory.cpp \
-  filltypes.cpp \
-  filltypespersp.cpp \
-  filterbitmap.cpp \
-  fontcache.cpp \
-  fontmgr.cpp \
-  fontscaler.cpp \
-  gammatext.cpp \
-  getpostextpath.cpp \
-  giantbitmap.cpp \
-  gradients.cpp \
-  gradients_no_texture.cpp \
-  gradientDirtyLaundry.cpp \
-  gradient_matrix.cpp \
-  gradtext.cpp \
-  hairmodes.cpp \
-  hittestpath.cpp \
-  imageblur.cpp \
-  imagemagnifier.cpp \
-  inversepaths.cpp \
-  lighting.cpp \
-  lumafilter.cpp \
-  image.cpp \
-  imagefiltersbase.cpp \
-  imagefilterscropped.cpp \
-  imagefiltersgraph.cpp \
-  internal_links.cpp \
-  lcdtext.cpp \
-  linepaths.cpp \
-  matrixconvolution.cpp \
-  megalooper.cpp \
-  mixedxfermodes.cpp \
-  modecolorfilters.cpp \
-  morphology.cpp \
-  nested.cpp \
-  ninepatchstretch.cpp \
-  offsetimagefilter.cpp \
-  nonclosedpaths.cpp \
-  offsetimagefilter.cpp \
-  optimizations.cpp \
-  ovals.cpp \
-  patheffects.cpp \
-  pathfill.cpp \
-  pathinterior.cpp \
-  pathopsinverse.cpp \
-  pathopsskpclip.cpp \
-  pathreverse.cpp \
-  perlinnoise.cpp \
-  pictureimagefilter.cpp \
-  points.cpp \
-  poly2poly.cpp \
-  polygons.cpp \
-  quadpaths.cpp \
-  rects.cpp \
-  rrect.cpp \
-  rrects.cpp \
-  roundrects.cpp \
-  samplerstress.cpp \
-  shaderbounds.cpp \
-  selftest.cpp \
-  shadertext.cpp \
-  shadertext2.cpp \
-  shadertext3.cpp \
-  shadows.cpp \
-  shallowgradient.cpp \
-  simpleaaclip.cpp \
-  skbug1719.cpp \
-  stringart.cpp \
-  spritebitmap.cpp \
-  srcmode.cpp \
-  strokefill.cpp \
-  strokerect.cpp \
-  strokes.cpp \
-  tablecolorfilter.cpp \
-  texteffects.cpp \
-  testimagefilters.cpp \
-  texdata.cpp \
-  thinrects.cpp \
-  thinstrokedrects.cpp \
-  tileimagefilter.cpp \
-  tilemodes.cpp \
-  tilemodes_scaled.cpp \
-  tinybitmap.cpp \
-  twopointradial.cpp \
-  typeface.cpp \
-  verttext.cpp \
-  verttext2.cpp \
-  verylargebitmap.cpp \
-  xfermodeimagefilter.cpp \
-  xfermodes.cpp \
-  xfermodes2.cpp \
-  xfermodes3.cpp
+	gm_expectations.cpp \
+	gmmain.cpp \
+	system_preferences_default.cpp \
+	../src/pipe/utils/SamplePipeControllers.cpp \
+	gm.cpp \
+	aaclip.cpp \
+	aarectmodes.cpp \
+	alphagradients.cpp \
+	arcofzorro.cpp \
+	arithmode.cpp \
+	beziereffects.cpp \
+	bicubicfilter.cpp \
+	bigblurs.cpp \
+	bigmatrix.cpp \
+	bigtext.cpp \
+	bitmapmatrix.cpp \
+	bitmapfilters.cpp \
+	bitmappremul.cpp \
+	bitmaprect.cpp \
+	bitmaprecttest.cpp \
+	bitmapscroll.cpp \
+	bitmapshader.cpp \
+	bitmapsource.cpp \
+	bleed.cpp \
+	blurcircles.cpp \
+	blurs.cpp \
+	blurquickreject.cpp \
+	blurrect.cpp \
+	blurroundrect.cpp \
+	canvasstate.cpp \
+	circles.cpp \
+	circularclips.cpp \
+	clippedbitmapshaders.cpp \
+	colorfilterimagefilter.cpp \
+	colorfilters.cpp \
+	colormatrix.cpp \
+	colortype.cpp \
+	complexclip.cpp \
+	complexclip2.cpp \
+	composeshader.cpp \
+	convexpaths.cpp \
+	convexpolyclip.cpp \
+	convexpolyeffect.cpp \
+	copyTo4444.cpp \
+	cubicpaths.cpp \
+	cmykjpeg.cpp \
+	degeneratesegments.cpp \
+	discard.cpp \
+	dashcubics.cpp \
+	dashing.cpp \
+	deviceproperties.cpp \
+	distantclip.cpp \
+	displacement.cpp \
+	downsamplebitmap.cpp \
+	drawlooper.cpp \
+	dropshadowimagefilter.cpp \
+	drrect.cpp \
+	extractbitmap.cpp \
+	emptypath.cpp \
+	fatpathfill.cpp \
+	factory.cpp \
+	filltypes.cpp \
+	filltypespersp.cpp \
+	filterbitmap.cpp \
+	fontcache.cpp \
+	fontmgr.cpp \
+	fontscaler.cpp \
+	gammatext.cpp \
+	getpostextpath.cpp \
+	giantbitmap.cpp \
+	gradients.cpp \
+	gradients_2pt_conical.cpp \
+	gradients_no_texture.cpp \
+	gradientDirtyLaundry.cpp \
+	gradient_matrix.cpp \
+	gradtext.cpp \
+	hairlines.cpp \
+	hairmodes.cpp \
+	hittestpath.cpp \
+	imagealphathreshold.cpp \
+	imageblur.cpp \
+	imageblurtiled.cpp \
+	imagemagnifier.cpp \
+	imageresizetiled.cpp \
+	inversepaths.cpp \
+	lerpmode.cpp \
+	lighting.cpp \
+	lumafilter.cpp \
+	image.cpp \
+	imagefiltersbase.cpp \
+	imagefiltersclipped.cpp \
+	imagefilterscropped.cpp \
+	imagefiltersgraph.cpp \
+	imagefiltersscaled.cpp \
+	internal_links.cpp \
+	lcdtext.cpp \
+	linepaths.cpp \
+	matrixconvolution.cpp \
+	matriximagefilter.cpp \
+	megalooper.cpp \
+	mixedxfermodes.cpp \
+	modecolorfilters.cpp \
+	morphology.cpp \
+	nested.cpp \
+	ninepatchstretch.cpp \
+	nonclosedpaths.cpp \
+	offsetimagefilter.cpp \
+	optimizations.cpp \
+	ovals.cpp \
+	patheffects.cpp \
+	pathfill.cpp \
+	pathinterior.cpp \
+	pathopsinverse.cpp \
+	pathopsskpclip.cpp \
+	pathreverse.cpp \
+	peekpixels.cpp \
+	perlinnoise.cpp \
+	pictureimagefilter.cpp \
+	pictureshader.cpp \
+	points.cpp \
+	poly2poly.cpp \
+	polygons.cpp \
+	quadpaths.cpp \
+	rects.cpp \
+	resizeimagefilter.cpp \
+	rrect.cpp \
+	rrects.cpp \
+	roundrects.cpp \
+	samplerstress.cpp \
+	shaderbounds.cpp \
+	selftest.cpp \
+	shadows.cpp \
+	shallowgradient.cpp \
+	simpleaaclip.cpp \
+	skbug1719.cpp \
+	stringart.cpp \
+	spritebitmap.cpp \
+	srcmode.cpp \
+	strokefill.cpp \
+	strokerect.cpp \
+	strokerects.cpp \
+	strokes.cpp \
+	stroketext.cpp \
+	tablecolorfilter.cpp \
+	texteffects.cpp \
+	testimagefilters.cpp \
+	texdata.cpp \
+	texturedomaineffect.cpp \
+	thinrects.cpp \
+	thinstrokedrects.cpp \
+	tileimagefilter.cpp \
+	tilemodes.cpp \
+	tilemodes_scaled.cpp \
+	tinybitmap.cpp \
+	twopointradial.cpp \
+	typeface.cpp \
+	vertices.cpp \
+	verttext.cpp \
+	verttext2.cpp \
+	xfermodeimagefilter.cpp \
+	xfermodes.cpp \
+	xfermodes2.cpp \
+	xfermodes3.cpp \
+	../src/utils/debugger/SkDrawCommand.cpp \
+	../src/utils/debugger/SkDebugCanvas.cpp \
+	../src/utils/debugger/SkObjectParser.cpp \
+	androidfallback.cpp \
+	../tools/flags/SkCommandLineFlags.cpp \
+	../src/gpu/GrTest.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-  libcutils \
-  libutils \
-  libskia \
-  libEGL \
-  libGLESv2
-  
+	liblog \
+	libskia \
+	libcutils \
+	libGLESv2 \
+	libEGL \
+	libz
+
 LOCAL_C_INCLUDES := \
-  external/skia/include/config \
-  external/skia/include/core \
-  external/skia/include/effects \
-  external/skia/include/gpu \
-  external/skia/include/images \
-  external/skia/include/pipe \
-  external/skia/include/utils \
-  external/skia/gm \
-  external/skia/src/core \
-  external/skia/src/effects \
-  external/skia/src/gpu \
-  external/skia/src/pipe/utils \
-  external/skia/src/utils
+	$(LOCAL_PATH)/../src/utils \
+	$(LOCAL_PATH)/../include/config \
+	$(LOCAL_PATH)/../include/core \
+	$(LOCAL_PATH)/../include/pathops \
+	$(LOCAL_PATH)/../include/pipe \
+	$(LOCAL_PATH)/../include/effects \
+	$(LOCAL_PATH)/../include/images \
+	$(LOCAL_PATH)/../include/ports \
+	$(LOCAL_PATH)/../src/sfnt \
+	$(LOCAL_PATH)/../include/utils \
+	$(LOCAL_PATH)/../include/gpu \
+	$(LOCAL_PATH)/../src/core \
+	$(LOCAL_PATH)/../src/gpu \
+	$(LOCAL_PATH)/../src/images \
+	$(LOCAL_PATH)/../src/effects \
+	$(LOCAL_PATH)/../src/pipe/utils \
+	$(LOCAL_PATH)/. \
+	$(LOCAL_PATH)/../src/utils/debugger \
+	$(LOCAL_PATH)/../src/lazy \
+	$(LOCAL_PATH)/../tools/flags \
+	$(LOCAL_PATH)/../include/pdf
 
-LOCAL_MODULE := skia_gm
+LOCAL_MODULE_TAGS := \
+	optional
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := \
+	skia_gm
 
+include external/stlport/libstlport.mk
 include $(BUILD_EXECUTABLE)