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..da9f2ba414c9906d490d95e5980b64992c1402e3 100644
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -1,23 +1,65 @@
 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',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ '*** END CONDITION_ANDROID ***']
+COPTS_ANDROID = []
+COPTS_UNIX = ['-Wno-implicit-fallthrough']
+DEFINES = ['*** BEGIN //conditions:default ***',
+ 'SK_BUILD_FOR_UNIX',
+ 'SK_SAMPLES_FOR_X',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'SK_BUILD_FOR_ANDROID',
+ 'SK_ARM_HAS_OPTIONAL_NEON',
+ '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_ARM_HAS_OPTIONAL_NEON',
+ '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 ***',
+ ':opts_arm',
+ ':opts_neon',
+ '*** END CONDITION_ANDROID ***']
+DEPS_ANDROID = [':opts_arm', ':opts_neon']
+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 ***',
+ 'tests/PDFDeflateWStreamTest.cpp',
+ 'tests/PDFDocumentTest.cpp',
+ 'tests/PDFGlyphsToUnicodeTest.cpp',
+ 'tests/PDFInvalidBitmapTest.cpp',
+ 'tests/PDFJpegEmbedTest.cpp',
+ 'tests/PDFMetadataAttributeTest.cpp',
+ 'tests/PDFOpaqueSrcModeToSrcOverTest.cpp',
+ 'tests/PDFPrimitivesTest.cpp',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'tests/FontMgrAndroidParserTest.cpp',
+ '*** END CONDITION_ANDROID ***']
 DM_SRCS = ['dm/DM.cpp',
  'dm/DMGpuSupport.h',
  'dm/DMJsonWriter.cpp',
@@ -386,14 +428,6 @@ DM_SRCS = ['dm/DM.cpp',
  'tests/OSPathTest.cpp',
  'tests/OncePtrTest.cpp',
  'tests/OnceTest.cpp',
- 'tests/PDFDeflateWStreamTest.cpp',
- 'tests/PDFDocumentTest.cpp',
- 'tests/PDFGlyphsToUnicodeTest.cpp',
- 'tests/PDFInvalidBitmapTest.cpp',
- 'tests/PDFJpegEmbedTest.cpp',
- 'tests/PDFMetadataAttributeTest.cpp',
- 'tests/PDFOpaqueSrcModeToSrcOverTest.cpp',
- 'tests/PDFPrimitivesTest.cpp',
  'tests/PackBitsTest.cpp',
  'tests/PaintTest.cpp',
  'tests/ParsePathTest.cpp',
@@ -407,6 +441,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',
@@ -560,6 +595,15 @@ DM_SRCS = ['dm/DM.cpp',
  'tools/timer/Timer.h',
  'tools/timer/TimerData.cpp',
  'tools/timer/TimerData.h']
+DM_SRCS_ANDROID = ['tests/FontMgrAndroidParserTest.cpp']
+DM_SRCS_UNIX = ['tests/PDFDeflateWStreamTest.cpp',
+ 'tests/PDFDocumentTest.cpp',
+ 'tests/PDFGlyphsToUnicodeTest.cpp',
+ 'tests/PDFInvalidBitmapTest.cpp',
+ 'tests/PDFJpegEmbedTest.cpp',
+ 'tests/PDFMetadataAttributeTest.cpp',
+ 'tests/PDFOpaqueSrcModeToSrcOverTest.cpp',
+ 'tests/PDFPrimitivesTest.cpp']
 HDRS = ['include/c/sk_canvas.h',
  'include/c/sk_data.h',
  'include/c/sk_image.h',
@@ -848,8 +892,19 @@ 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/doc/SkDocument_PDF.cpp',
+ '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',
@@ -870,6 +925,35 @@ PLATFORM_SRCS = ['src/opts/Sk4px_SSE2.h',
  'src/opts/SkUtils_opts.h',
  'src/opts/SkXfermode_opts.h',
  'src/opts/opts_check_x86.cpp',
+ 'src/pdf/SkDeflate.cpp',
+ 'src/pdf/SkDeflate.h',
+ 'src/pdf/SkJpegInfo.cpp',
+ 'src/pdf/SkJpegInfo.h',
+ 'src/pdf/SkPDFBitmap.cpp',
+ 'src/pdf/SkPDFBitmap.h',
+ 'src/pdf/SkPDFCanon.cpp',
+ 'src/pdf/SkPDFCanon.h',
+ 'src/pdf/SkPDFDevice.cpp',
+ 'src/pdf/SkPDFDevice.h',
+ 'src/pdf/SkPDFFont.cpp',
+ 'src/pdf/SkPDFFont.h',
+ 'src/pdf/SkPDFFontImpl.h',
+ 'src/pdf/SkPDFFormXObject.cpp',
+ 'src/pdf/SkPDFFormXObject.h',
+ 'src/pdf/SkPDFGraphicState.cpp',
+ 'src/pdf/SkPDFGraphicState.h',
+ 'src/pdf/SkPDFMetadata.cpp',
+ 'src/pdf/SkPDFMetadata.h',
+ 'src/pdf/SkPDFResourceDict.cpp',
+ 'src/pdf/SkPDFResourceDict.h',
+ 'src/pdf/SkPDFShader.cpp',
+ 'src/pdf/SkPDFShader.h',
+ 'src/pdf/SkPDFStream.cpp',
+ 'src/pdf/SkPDFStream.h',
+ 'src/pdf/SkPDFTypes.cpp',
+ 'src/pdf/SkPDFTypes.h',
+ 'src/pdf/SkPDFUtils.cpp',
+ 'src/pdf/SkPDFUtils.h',
  'src/ports/SkDebug_stdio.cpp',
  'src/ports/SkDiscardableMemory_none.cpp',
  'src/ports/SkFontHost_FreeType.cpp',
@@ -885,7 +969,46 @@ 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',
+ 'src/utils/SkThreadUtils_pthread_linux.cpp',
+ '*** END //conditions:default ***',
+ '*** BEGIN CONDITION_ANDROID ***',
+ 'src/doc/SkDocument_PDF_None.cpp',
+ 'src/gpu/gl/GrGLDefaultInterface_none.cpp',
+ 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
+ 'src/opts/Sk4px_none.h',
+ 'src/opts/SkBlitMask_opts.h',
+ 'src/opts/SkBlitRow_opts.h',
+ 'src/opts/SkBlurImageFilter_opts.h',
+ 'src/opts/SkColorCubeFilter_opts.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/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',
+ 'src/utils/SkThreadUtils_pthread_other.cpp',
+ '*** END CONDITION_ANDROID ***']
 SRCS = ['include/private/SkAtomics.h',
  'include/private/SkChecksum.h',
  'include/private/SkFloatBits.h',
@@ -1173,6 +1296,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',
@@ -1248,7 +1374,6 @@ SRCS = ['include/private/SkAtomics.h',
  'src/core/SkYUVPlanesCache.cpp',
  'src/core/SkYUVPlanesCache.h',
  'src/doc/SkDocument.cpp',
- 'src/doc/SkDocument_PDF.cpp',
  'src/doc/SkDocument_XPS_None.cpp',
  'src/effects/GrCircleBlurFragmentProcessor.cpp',
  'src/effects/GrCircleBlurFragmentProcessor.h',
@@ -1361,6 +1486,7 @@ SRCS = ['include/private/SkAtomics.h',
  'src/gpu/GrDrawContext.cpp',
  'src/gpu/GrDrawTarget.cpp',
  'src/gpu/GrDrawTarget.h',
+ 'src/gpu/GrDrawingManager.h',
  'src/gpu/GrFontScaler.cpp',
  'src/gpu/GrFontScaler.h',
  'src/gpu/GrFragmentProcessor.cpp',
@@ -1568,7 +1694,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',
@@ -1658,8 +1783,6 @@ 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',
@@ -1769,35 +1892,6 @@ SRCS = ['include/private/SkAtomics.h',
  'src/pathops/SkPathWriter.h',
  'src/pathops/SkReduceOrder.cpp',
  'src/pathops/SkReduceOrder.h',
- 'src/pdf/SkDeflate.cpp',
- 'src/pdf/SkDeflate.h',
- 'src/pdf/SkJpegInfo.cpp',
- 'src/pdf/SkJpegInfo.h',
- 'src/pdf/SkPDFBitmap.cpp',
- 'src/pdf/SkPDFBitmap.h',
- 'src/pdf/SkPDFCanon.cpp',
- 'src/pdf/SkPDFCanon.h',
- 'src/pdf/SkPDFDevice.cpp',
- 'src/pdf/SkPDFDevice.h',
- 'src/pdf/SkPDFFont.cpp',
- 'src/pdf/SkPDFFont.h',
- 'src/pdf/SkPDFFontImpl.h',
- 'src/pdf/SkPDFFormXObject.cpp',
- 'src/pdf/SkPDFFormXObject.h',
- 'src/pdf/SkPDFGraphicState.cpp',
- 'src/pdf/SkPDFGraphicState.h',
- 'src/pdf/SkPDFMetadata.cpp',
- 'src/pdf/SkPDFMetadata.h',
- 'src/pdf/SkPDFResourceDict.cpp',
- 'src/pdf/SkPDFResourceDict.h',
- 'src/pdf/SkPDFShader.cpp',
- 'src/pdf/SkPDFShader.h',
- 'src/pdf/SkPDFStream.cpp',
- 'src/pdf/SkPDFStream.h',
- 'src/pdf/SkPDFTypes.cpp',
- 'src/pdf/SkPDFTypes.h',
- 'src/pdf/SkPDFUtils.cpp',
- 'src/pdf/SkPDFUtils.h',
  'src/pipe/SkGPipePriv.h',
  'src/pipe/SkGPipeRead.cpp',
  'src/pipe/SkGPipeWrite.cpp',
@@ -1900,7 +1994,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 +2010,111 @@ SRCS = ['include/private/SkAtomics.h',
  'third_party/etc1/etc1.h',
  'third_party/ktx/ktx.cpp',
  'third_party/ktx/ktx.h']
+SRCS_ANDROID = ['src/doc/SkDocument_PDF_None.cpp',
+ 'src/gpu/gl/GrGLDefaultInterface_none.cpp',
+ 'src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
+ 'src/opts/Sk4px_none.h',
+ 'src/opts/SkBlitMask_opts.h',
+ 'src/opts/SkBlitRow_opts.h',
+ 'src/opts/SkBlurImageFilter_opts.h',
+ 'src/opts/SkColorCubeFilter_opts.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/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',
+ 'src/utils/SkThreadUtils_pthread_other.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/doc/SkDocument_PDF.cpp',
+ '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/pdf/SkDeflate.cpp',
+ 'src/pdf/SkDeflate.h',
+ 'src/pdf/SkJpegInfo.cpp',
+ 'src/pdf/SkJpegInfo.h',
+ 'src/pdf/SkPDFBitmap.cpp',
+ 'src/pdf/SkPDFBitmap.h',
+ 'src/pdf/SkPDFCanon.cpp',
+ 'src/pdf/SkPDFCanon.h',
+ 'src/pdf/SkPDFDevice.cpp',
+ 'src/pdf/SkPDFDevice.h',
+ 'src/pdf/SkPDFFont.cpp',
+ 'src/pdf/SkPDFFont.h',
+ 'src/pdf/SkPDFFontImpl.h',
+ 'src/pdf/SkPDFFormXObject.cpp',
+ 'src/pdf/SkPDFFormXObject.h',
+ 'src/pdf/SkPDFGraphicState.cpp',
+ 'src/pdf/SkPDFGraphicState.h',
+ 'src/pdf/SkPDFMetadata.cpp',
+ 'src/pdf/SkPDFMetadata.h',
+ 'src/pdf/SkPDFResourceDict.cpp',
+ 'src/pdf/SkPDFResourceDict.h',
+ 'src/pdf/SkPDFShader.cpp',
+ 'src/pdf/SkPDFShader.h',
+ 'src/pdf/SkPDFStream.cpp',
+ 'src/pdf/SkPDFStream.h',
+ 'src/pdf/SkPDFTypes.cpp',
+ 'src/pdf/SkPDFTypes.h',
+ 'src/pdf/SkPDFUtils.cpp',
+ 'src/pdf/SkPDFUtils.h',
+ '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',
+ 'src/utils/SkThreadUtils_pthread_linux.cpp']