Enable BUILD file compilation of skia and dm with --config=android_arm.

tools/BUILD.public.expected

Index: tools/BUILD.public.expected
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index c8f156f06c74784ab7023b4321acc809ddc3f763..323d7a91051208b06b99d04b687b1fda31b1fc28 100644
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -1,23 +1,54 @@
 This file is auto-generated by tools/BUILD_simulator.py.
 It expands BUILD.public to make it easy to see changes.
-COPTS = ['-Wno-implicit-fallthrough']
-DEFINES = ['SK_RELEASE',
+COPTS = ['*** BEGIN //conditions:default ***',
+ '-Wno-implicit-fallthrough',
+ '-Wno-deprecated-declarations',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ '-mfpu=neon',
+ '*** END CONDITION_ANDROID ***']
+COPTS_ANDROID = ['-mfpu=neon']
+COPTS_UNIX = ['-Wno-implicit-fallthrough', '-Wno-deprecated-declarations']
+DEFINES = ['*** BEGIN //conditions:default ***',
+ 'SK_BUILD_FOR_UNIX',
+ 'SK_SAMPLES_FOR_X',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'SK_BUILD_FOR_ANDROID',
+ 'SK_PNG_NO_INDEX_SUPPORTED',
+ '*** END CONDITION_ANDROID ***',
+ 'SK_RELEASE',
  'SK_USE_FLOATBITS',
  'SK_USE_FREETYPE_EMBOLDEN',
- 'GOOGLE3',
- 'SK_BUILD_FOR_UNIX',
- 'SK_SAMPLES_FOR_X']
+ 'GOOGLE3']
+DEFINES_ALL = ['SK_RELEASE', 'SK_USE_FLOATBITS', 'SK_USE_FREETYPE_EMBOLDEN', 'GOOGLE3']
+DEFINES_ANDROID = ['SK_BUILD_FOR_ANDROID', 'SK_PNG_NO_INDEX_SUPPORTED']
+DEFINES_UNIX = ['SK_BUILD_FOR_UNIX', 'SK_SAMPLES_FOR_X']
+DEPS = ['*** BEGIN //conditions:default ***',
+ ':opts_sse4',
+ ':opts_ssse3',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ '*** END CONDITION_ANDROID ***']
+DEPS_ANDROID = []
+DEPS_UNIX = [':opts_sse4', ':opts_ssse3']
 DM_INCLUDES = ['gm',
  'src/codec',
  'src/effects',
  'src/fonts',
  'src/pathops',
  'src/pipe/utils',
+ 'src/ports',
  'src/utils/debugger',
  'tests',
  'tools',
  'tools/flags',
  'tools/timer']
+DM_PLATFORM_SRCS = ['*** BEGIN //conditions:default ***',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'tests/FontMgrAndroidParserTest.cpp',
+ '*** END CONDITION_ANDROID ***']
 DM_SRCS = ['dm/DM.cpp',
  'dm/DMGpuSupport.h',
  'dm/DMJsonWriter.cpp',
@@ -407,6 +438,7 @@ DM_SRCS = ['dm/DM.cpp',
  'tests/PathOpsBuilderTest.cpp',
  'tests/PathOpsConicIntersectionTest.cpp',
  'tests/PathOpsConicLineIntersectionTest.cpp',
+ 'tests/PathOpsCubicConicIntersectionTest.cpp',
  'tests/PathOpsCubicIntersectionTest.cpp',
  'tests/PathOpsCubicIntersectionTestData.cpp',
  'tests/PathOpsCubicIntersectionTestData.h',
@@ -518,6 +550,7 @@ DM_SRCS = ['dm/DM.cpp',
  'tests/TextBlobTest.cpp',
  'tests/TextureCompressionTest.cpp',
  'tests/Time.cpp',
+ 'tests/TopoSortTest.cpp',
  'tests/TraceMemoryDumpTest.cpp',
  'tests/TracingTest.cpp',
  'tests/TypefaceTest.cpp',
@@ -539,6 +572,8 @@ DM_SRCS = ['dm/DM.cpp',
  'tools/Resources.h',
  'tools/SkBitmapRegionCanvas.cpp',
  'tools/SkBitmapRegionCanvas.h',
+ 'tools/SkBitmapRegionCodec.cpp',
+ 'tools/SkBitmapRegionCodec.h',
  'tools/SkBitmapRegionDecoderInterface.cpp',
  'tools/SkBitmapRegionDecoderInterface.h',
  'tools/SkBitmapRegionSampler.cpp',
@@ -550,16 +585,10 @@ DM_SRCS = ['dm/DM.cpp',
  'tools/sk_tool_utils.cpp',
  'tools/sk_tool_utils.h',
  'tools/sk_tool_utils_font.cpp',
- 'tools/timer/GpuTimer.cpp',
- 'tools/timer/GpuTimer.h',
- 'tools/timer/SysTimer_mach.h',
- 'tools/timer/SysTimer_posix.cpp',
- 'tools/timer/SysTimer_posix.h',
- 'tools/timer/SysTimer_windows.h',
  'tools/timer/Timer.cpp',
- 'tools/timer/Timer.h',
- 'tools/timer/TimerData.cpp',
- 'tools/timer/TimerData.h']
+ 'tools/timer/Timer.h']
+DM_SRCS_ANDROID = ['tests/FontMgrAndroidParserTest.cpp']
+DM_SRCS_UNIX = []
 HDRS = ['include/c/sk_canvas.h',
  'include/c/sk_data.h',
  'include/c/sk_image.h',
@@ -571,9 +600,9 @@ HDRS = ['include/c/sk_canvas.h',
  'include/c/sk_shader.h',
  'include/c/sk_surface.h',
  'include/c/sk_types.h',
+ 'include/codec/SkAndroidCodec.h',
  'include/codec/SkCodec.h',
  'include/codec/SkEncodedFormat.h',
- 'include/codec/SkScaledCodec.h',
  'include/config/SkUserConfig.h',
  'include/core/SkAnnotation.h',
  'include/core/SkBBHFactory.h',
@@ -760,6 +789,7 @@ HDRS = ['include/c/sk_canvas.h',
  'include/gpu/gl/GrGLFunctions.h',
  'include/gpu/gl/GrGLInterface.h',
  'include/gpu/gl/GrGLSLPrettyPrint.h',
+ 'include/gpu/gl/GrGLTypes.h',
  'include/gpu/gl/SkGLContext.h',
  'include/gpu/gl/SkNullGLContext.h',
  'include/gpu/gl/angle/SkANGLEGLContext.h',
@@ -848,8 +878,18 @@ INCLUDES = ['include/c',
  'src/utils',
  'third_party/etc1',
  'third_party/ktx']
-LINKOPTS = ['-ldl']
-PLATFORM_SRCS = ['src/opts/Sk4px_SSE2.h',
+LINKOPTS = ['*** BEGIN //conditions:default ***',
+ '-ldl',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ '-ldl',
+ '-lEGL',
+ '*** END CONDITION_ANDROID ***']
+PLATFORM_SRCS = ['*** BEGIN //conditions:default ***',
+ 'src/gpu/gl/GrGLDefaultInterface_native.cpp',
+ 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
+ 'src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
+ 'src/opts/Sk4px_SSE2.h',
  'src/opts/Sk4px_none.h',
  'src/opts/SkBitmapFilter_opts_SSE2.cpp',
  'src/opts/SkBitmapFilter_opts_SSE2.h',
@@ -885,7 +925,58 @@ PLATFORM_SRCS = ['src/opts/Sk4px_SSE2.h',
  'src/ports/SkOSLibrary.h',
  'src/ports/SkOSLibrary_posix.cpp',
  'src/ports/SkTLS_pthread.cpp',
- 'src/ports/SkTime_Unix.cpp']
+ 'src/ports/SkTime_Unix.cpp',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'src/gpu/gl/GrGLDefaultInterface_none.cpp',
+ 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
+ 'src/opts/Sk4px_NEON.h',
+ 'src/opts/Sk4px_none.h',
+ 'src/opts/SkBitmapProcState_arm_neon.cpp',
+ 'src/opts/SkBitmapProcState_filter_neon.h',
+ 'src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
+ 'src/opts/SkBitmapProcState_matrix_neon.h',
+ 'src/opts/SkBitmapProcState_opts_arm.cpp',
+ 'src/opts/SkBlitMask_opts.h',
+ 'src/opts/SkBlitMask_opts_arm.cpp',
+ 'src/opts/SkBlitMask_opts_arm_neon.cpp',
+ 'src/opts/SkBlitMask_opts_arm_neon.h',
+ 'src/opts/SkBlitRow_opts.h',
+ 'src/opts/SkBlitRow_opts_arm.cpp',
+ 'src/opts/SkBlitRow_opts_arm_neon.cpp',
+ 'src/opts/SkBlitRow_opts_arm_neon.h',
+ 'src/opts/SkBlurImageFilter_opts.h',
+ 'src/opts/SkColorCubeFilter_opts.h',
+ 'src/opts/SkColor_opts_neon.h',
+ 'src/opts/SkFloatingPoint_opts.h',
+ 'src/opts/SkMatrix_opts.h',
+ 'src/opts/SkMorphologyImageFilter_opts.h',
+ 'src/opts/SkNx_neon.h',
+ 'src/opts/SkNx_sse.h',
+ 'src/opts/SkOpts_neon.cpp',
+ 'src/opts/SkTextureCompressor_opts.h',
+ 'src/opts/SkUtils_opts.h',
+ 'src/opts/SkXfermode_opts.h',
+ 'src/ports/SkDebug_android.cpp',
+ 'src/ports/SkDiscardableMemory_none.cpp',
+ 'src/ports/SkFontHost_FreeType.cpp',
+ 'src/ports/SkFontHost_FreeType_common.cpp',
+ 'src/ports/SkFontHost_FreeType_common.h',
+ 'src/ports/SkFontMgr_android.cpp',
+ 'src/ports/SkFontMgr_android_factory.cpp',
+ 'src/ports/SkFontMgr_android_parser.cpp',
+ 'src/ports/SkFontMgr_android_parser.h',
+ 'src/ports/SkFontMgr_custom.cpp',
+ 'src/ports/SkGlobalInitialization_default.cpp',
+ 'src/ports/SkImageGenerator_skia.cpp',
+ 'src/ports/SkMemory_malloc.cpp',
+ 'src/ports/SkOSFile_posix.cpp',
+ 'src/ports/SkOSFile_stdio.cpp',
+ 'src/ports/SkOSLibrary.h',
+ 'src/ports/SkOSLibrary_posix.cpp',
+ 'src/ports/SkTLS_pthread.cpp',
+ 'src/ports/SkTime_Unix.cpp',
+ '*** END CONDITION_ANDROID ***']
 SRCS = ['include/private/SkAtomics.h',
  'include/private/SkChecksum.h',
  'include/private/SkFloatBits.h',
@@ -910,6 +1001,7 @@ SRCS = ['include/private/SkAtomics.h',
  'src/c/sk_paint.cpp',
  'src/c/sk_surface.cpp',
  'src/c/sk_types_priv.h',
+ 'src/codec/SkAndroidCodec.cpp',
  'src/codec/SkBmpCodec.cpp',
  'src/codec/SkBmpCodec.h',
  'src/codec/SkBmpMaskCodec.cpp',
@@ -938,11 +1030,14 @@ SRCS = ['include/private/SkAtomics.h',
  'src/codec/SkMaskSwizzler.h',
  'src/codec/SkMasks.cpp',
  'src/codec/SkMasks.h',
+ 'src/codec/SkSampledCodec.h',
  'src/codec/SkSampler.cpp',
  'src/codec/SkSampler.h',
  'src/codec/SkScaledCodec.cpp',
  'src/codec/SkSwizzler.cpp',
  'src/codec/SkSwizzler.h',
+ 'src/codec/SkWebpAdapterCodec.cpp',
+ 'src/codec/SkWebpAdapterCodec.h',
  'src/codec/SkWebpCodec.cpp',
  'src/codec/SkWebpCodec.h',
  'src/core/Sk4px.h',
@@ -1001,6 +1096,7 @@ SRCS = ['include/private/SkAtomics.h',
  'src/core/SkCachedData.h',
  'src/core/SkCanvas.cpp',
  'src/core/SkCanvasPriv.h',
+ 'src/core/SkChecksum.cpp',
  'src/core/SkChunkAlloc.cpp',
  'src/core/SkClipStack.cpp',
  'src/core/SkColor.cpp',
@@ -1173,6 +1269,9 @@ SRCS = ['include/private/SkAtomics.h',
  'src/core/SkRegion.cpp',
  'src/core/SkRegionPriv.h',
  'src/core/SkRegion_path.cpp',
+ 'src/core/SkRemote.cpp',
+ 'src/core/SkRemote.h',
+ 'src/core/SkRemote_protocol.h',
  'src/core/SkResourceCache.cpp',
  'src/core/SkResourceCache.h',
  'src/core/SkScalar.cpp',
@@ -1214,6 +1313,7 @@ SRCS = ['include/private/SkAtomics.h',
  'src/core/SkTMultiMap.h',
  'src/core/SkTSearch.cpp',
  'src/core/SkTSort.h',
+ 'src/core/SkTTopoSort.h',
  'src/core/SkTaskGroup.cpp',
  'src/core/SkTaskGroup.h',
  'src/core/SkTextBlob.cpp',
@@ -1361,6 +1461,8 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/GrDrawContext.cpp',
  'src/gpu/GrDrawTarget.cpp',
  'src/gpu/GrDrawTarget.h',
+ 'src/gpu/GrDrawingManager.cpp',
+ 'src/gpu/GrDrawingManager.h',
  'src/gpu/GrFontScaler.cpp',
  'src/gpu/GrFontScaler.h',
  'src/gpu/GrFragmentProcessor.cpp',
@@ -1453,7 +1555,8 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/GrTextContext.h',
  'src/gpu/GrTexture.cpp',
  'src/gpu/GrTextureAccess.cpp',
- 'src/gpu/GrTextureMaker.h',
+ 'src/gpu/GrTextureParamsAdjuster.cpp',
+ 'src/gpu/GrTextureParamsAdjuster.h',
  'src/gpu/GrTexturePriv.h',
  'src/gpu/GrTextureProvider.cpp',
  'src/gpu/GrTraceMarker.cpp',
@@ -1568,7 +1671,6 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/gl/GrGLContext.cpp',
  'src/gpu/gl/GrGLContext.h',
  'src/gpu/gl/GrGLCreateNullInterface.cpp',
- 'src/gpu/gl/GrGLDefaultInterface_native.cpp',
  'src/gpu/gl/GrGLDefines.h',
  'src/gpu/gl/GrGLExtensions.cpp',
  'src/gpu/gl/GrGLFragmentProcessor.cpp',
@@ -1607,7 +1709,6 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/gl/GrGLRenderTarget.h',
  'src/gpu/gl/GrGLSLBlend.cpp',
  'src/gpu/gl/GrGLSLBlend.h',
- 'src/gpu/gl/GrGLShaderVar.h',
  'src/gpu/gl/GrGLStencilAttachment.cpp',
  'src/gpu/gl/GrGLStencilAttachment.h',
  'src/gpu/gl/GrGLTexture.cpp',
@@ -1658,12 +1759,11 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/gl/debug/GrVertexArrayObj.h',
  'src/gpu/gl/debug/SkDebugGLContext.cpp',
  'src/gpu/gl/debug/SkDebugGLContext.h',
- 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
- 'src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
  'src/gpu/glsl/GrGLSL.cpp',
  'src/gpu/glsl/GrGLSL.h',
  'src/gpu/glsl/GrGLSLCaps.cpp',
  'src/gpu/glsl/GrGLSLCaps.h',
+ 'src/gpu/glsl/GrGLSLShaderVar.h',
  'src/gpu/glsl/GrGLSL_impl.h',
  'src/image/SkImage.cpp',
  'src/image/SkImagePriv.h',
@@ -1900,7 +2000,6 @@ SRCS = ['include/private/SkAtomics.h',
  'src/utils/SkThreadUtils.h',
  'src/utils/SkThreadUtils_pthread.cpp',
  'src/utils/SkThreadUtils_pthread.h',
- 'src/utils/SkThreadUtils_pthread_linux.cpp',
  'src/utils/SkThreadUtils_win.h',
  'src/utils/SkWhitelistChecksums.cpp',
  'src/utils/SkWhitelistTypefaces.cpp',
@@ -1917,5 +2016,93 @@ SRCS = ['include/private/SkAtomics.h',
  'third_party/etc1/etc1.h',
  'third_party/ktx/ktx.cpp',
  'third_party/ktx/ktx.h']
+SRCS_ANDROID = ['src/gpu/gl/GrGLDefaultInterface_none.cpp',
+ 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
+ 'src/opts/Sk4px_NEON.h',
+ 'src/opts/Sk4px_none.h',
+ 'src/opts/SkBitmapProcState_arm_neon.cpp',
+ 'src/opts/SkBitmapProcState_filter_neon.h',
+ 'src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
+ 'src/opts/SkBitmapProcState_matrix_neon.h',
+ 'src/opts/SkBitmapProcState_opts_arm.cpp',
+ 'src/opts/SkBlitMask_opts.h',
+ 'src/opts/SkBlitMask_opts_arm.cpp',
+ 'src/opts/SkBlitMask_opts_arm_neon.cpp',
+ 'src/opts/SkBlitMask_opts_arm_neon.h',
+ 'src/opts/SkBlitRow_opts.h',
+ 'src/opts/SkBlitRow_opts_arm.cpp',
+ 'src/opts/SkBlitRow_opts_arm_neon.cpp',
+ 'src/opts/SkBlitRow_opts_arm_neon.h',
+ 'src/opts/SkBlurImageFilter_opts.h',
+ 'src/opts/SkColorCubeFilter_opts.h',
+ 'src/opts/SkColor_opts_neon.h',
+ 'src/opts/SkFloatingPoint_opts.h',
+ 'src/opts/SkMatrix_opts.h',
+ 'src/opts/SkMorphologyImageFilter_opts.h',
+ 'src/opts/SkNx_neon.h',
+ 'src/opts/SkNx_sse.h',
+ 'src/opts/SkOpts_neon.cpp',
+ 'src/opts/SkTextureCompressor_opts.h',
+ 'src/opts/SkUtils_opts.h',
+ 'src/opts/SkXfermode_opts.h',
+ 'src/ports/SkDebug_android.cpp',
+ 'src/ports/SkDiscardableMemory_none.cpp',
+ 'src/ports/SkFontHost_FreeType.cpp',
+ 'src/ports/SkFontHost_FreeType_common.cpp',
+ 'src/ports/SkFontHost_FreeType_common.h',
+ 'src/ports/SkFontMgr_android.cpp',
+ 'src/ports/SkFontMgr_android_factory.cpp',
+ 'src/ports/SkFontMgr_android_parser.cpp',
+ 'src/ports/SkFontMgr_android_parser.h',
+ 'src/ports/SkFontMgr_custom.cpp',
+ 'src/ports/SkGlobalInitialization_default.cpp',
+ 'src/ports/SkImageGenerator_skia.cpp',
+ 'src/ports/SkMemory_malloc.cpp',
+ 'src/ports/SkOSFile_posix.cpp',
+ 'src/ports/SkOSFile_stdio.cpp',
+ 'src/ports/SkOSLibrary.h',
+ 'src/ports/SkOSLibrary_posix.cpp',
+ 'src/ports/SkTLS_pthread.cpp',
+ 'src/ports/SkTime_Unix.cpp']
 SRCS_SSE4 = ['src/opts/SkBlitRow_opts_SSE4.cpp', 'src/opts/SkOpts_sse41.cpp']
 SRCS_SSSE3 = ['src/opts/SkBitmapProcState_opts_SSSE3.cpp', 'src/opts/SkOpts_ssse3.cpp']
+SRCS_UNIX = ['src/gpu/gl/GrGLDefaultInterface_native.cpp',
+ 'src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
+ 'src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
+ 'src/opts/Sk4px_SSE2.h',
+ 'src/opts/Sk4px_none.h',
+ 'src/opts/SkBitmapFilter_opts_SSE2.cpp',
+ 'src/opts/SkBitmapFilter_opts_SSE2.h',
+ 'src/opts/SkBitmapProcState_opts_SSE2.cpp',
+ 'src/opts/SkBitmapProcState_opts_SSE2.h',
+ 'src/opts/SkBlitMask_opts.h',
+ 'src/opts/SkBlitRow_opts.h',
+ 'src/opts/SkBlitRow_opts_SSE2.cpp',
+ 'src/opts/SkBlitRow_opts_SSE2.h',
+ 'src/opts/SkBlurImageFilter_opts.h',
+ 'src/opts/SkColorCubeFilter_opts.h',
+ 'src/opts/SkColor_opts_SSE2.h',
+ 'src/opts/SkFloatingPoint_opts.h',
+ 'src/opts/SkMatrix_opts.h',
+ 'src/opts/SkMorphologyImageFilter_opts.h',
+ 'src/opts/SkNx_sse.h',
+ 'src/opts/SkTextureCompressor_opts.h',
+ 'src/opts/SkUtils_opts.h',
+ 'src/opts/SkXfermode_opts.h',
+ 'src/opts/opts_check_x86.cpp',
+ 'src/ports/SkDebug_stdio.cpp',
+ 'src/ports/SkDiscardableMemory_none.cpp',
+ 'src/ports/SkFontHost_FreeType.cpp',
+ 'src/ports/SkFontHost_FreeType_common.cpp',
+ 'src/ports/SkFontHost_FreeType_common.h',
+ 'src/ports/SkFontMgr_custom.cpp',
+ 'src/ports/SkFontMgr_custom_directory_factory.cpp',
+ 'src/ports/SkGlobalInitialization_default.cpp',
+ 'src/ports/SkImageGenerator_skia.cpp',
+ 'src/ports/SkMemory_malloc.cpp',
+ 'src/ports/SkOSFile_posix.cpp',
+ 'src/ports/SkOSFile_stdio.cpp',
+ 'src/ports/SkOSLibrary.h',
+ 'src/ports/SkOSLibrary_posix.cpp',
+ 'src/ports/SkTLS_pthread.cpp',
+ 'src/ports/SkTime_Unix.cpp']