BUILD.public - Issue 1414643002: Enable BUILD file compilation of skia and dm with --config=android_arm.

Unified Diff: BUILD.public

Issue 1414643002: Enable BUILD file compilation of skia and dm with --config=android_arm. (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Address comments; rebase. Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: BUILD.public

diff --git a/BUILD.public b/BUILD.public

index 42c803273cb505211511da955a0af8f35fb49616..2c769c180a8e3654f27dde0d7e7a6110abd7df89 100644

--- a/BUILD.public

+++ b/BUILD.public

@@ -11,7 +11,6 @@ SRCS = glob(

"include/private/*.h",

"src/**/*.h",

"src/**/*.cpp",

- "src/**/*.c",

# Third Party

"third_party/etc1/*.cpp",

@@ -24,6 +23,9 @@ SRCS = glob(

"src/device/xps/*", # Windows-only. Move to ports?

"src/doc/*_XPS.cpp", # Windows-only. Move to ports?

"src/gpu/gl/android/*",

+ "src/gpu/gl/egl/*",

+ "src/gpu/gl/glx/*",

+ "src/gpu/gl/nacl/*",

"src/gpu/gl/iOS/*",

"src/gpu/gl/mac/*",

"src/gpu/gl/win/*",

@@ -41,10 +43,9 @@ SRCS = glob(

# TODO(mtklein): Move to opts?

"src/doc/SkDocument_PDF_None.cpp", # We use SkDocument_PDF.cpp.

"src/fonts/*fontconfig*",

- "src/gpu/gl/egl/*", # Conflicts with gpu/gl/glx.

- "src/gpu/gl/nacl/*", # Conflicts with gpu/gl/glx.

- "src/gpu/gl/GrGLDefaultInterface_none.cpp", # Conflicts with src/gpu/gl/GrGLDefaultInterface_native.cpp

- "src/gpu/gl/GrGLCreateNativeInterface_none.cpp", # Conflicts with src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp

+ "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",

+ "src/gpu/gl/GrGLDefaultInterface_native.cpp",

+ "src/gpu/gl/GrGLDefaultInterface_none.cpp",

# Exclude files that don't compile with the current DEFINES.

"src/gpu/gl/angle/*", # Requires SK_ANGLE define.

@@ -62,8 +63,11 @@ SRCS = glob(

)

# Platform-dependent SRCS for google3-default platform.

-PLATFORM_SRCS = glob(

+SRCS_UNIX = glob(

[

+ "src/gpu/gl/GrGLDefaultInterface_native.cpp",

+ "src/gpu/gl/glx/**/*.cpp",

+ "src/gpu/gl/glx/**/*.h",

"src/opts/**/*.cpp",

"src/opts/**/*.h",

"src/ports/**/*.cpp",

@@ -74,12 +78,14 @@ PLATFORM_SRCS = glob(

"src/opts/*mips*",

"src/opts/*NEON*",

"src/opts/*neon*",

+ # Included in :opts_ssse3 library.

"src/opts/*SSSE3*",

"src/opts/*ssse3*",

+ # Included in :opts_sse4 library.

"src/opts/*SSE4*",

"src/opts/*sse4*",

- "src/opts/SkBlitMask_opts_none.cpp",

"src/opts/SkBitmapProcState_opts_none.cpp",

+ "src/opts/SkBlitMask_opts_none.cpp",

"src/opts/SkBlitRow_opts_none.cpp",

"src/ports/*android*",

"src/ports/*chromium*",

@@ -99,6 +105,57 @@ PLATFORM_SRCS = glob(

)

+# Platform-dependent SRCS for google3-default Android.

+SRCS_ANDROID = glob(

+ [

+ # TODO(benjaminwagner): Figure out how to compile with EGL.

+ "src/gpu/gl/GrGLDefaultInterface_none.cpp",

+ "src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp",

+ "src/opts/**/*.cpp",

+ "src/opts/**/*.h",

+ "src/ports/**/*.cpp",

+ "src/ports/**/*.h",

+ ],

+ exclude = [

+ # Included in :opts_arm library.

+ "src/opts/*arm*",

+ "src/opts/*mips*",

+ # Included in :opts_neon library.

+ "src/opts/*NEON*",

+ "src/opts/*neon*",

+ "src/opts/*SSE2*",

+ "src/opts/*SSSE3*",

+ "src/opts/*ssse3*",

+ "src/opts/*SSE4*",

+ "src/opts/*sse4*",

+ "src/opts/*x86*",

+ "src/opts/SkBitmapProcState_opts_none.cpp",

+ "src/opts/SkBlitMask_opts_none.cpp",

+ "src/opts/SkBlitRow_opts_none.cpp",

+ "src/ports/*chromium*",

+ "src/ports/*CG*",

+ "src/ports/*fontconfig*",

+ "src/ports/*FontConfig*",

+ "src/ports/*mac*",

+ "src/ports/*mozalloc*",

+ "src/ports/*nacl*",

+ "src/ports/*win*",

+ "src/ports/SkDebug_stdio.cpp",

+ "src/ports/SkFontMgr_custom_directory_factory.cpp",

+ "src/ports/SkFontMgr_custom_embedded_factory.cpp",

+ "src/ports/SkFontMgr_empty_factory.cpp",

+ "src/ports/SkImageDecoder_WIC.cpp",

+ "src/ports/SkImageDecoder_empty.cpp",

+ "src/ports/SkImageGenerator_none.cpp",

+ "src/ports/SkTLS_none.cpp",

+ ],

+PLATFORM_SRCS = select({

+ CONDITION_ANDROID: SRCS_ANDROID,

+ "//conditions:default": SRCS_UNIX,

+})

SRCS_SSSE3 = glob(

[

"src/opts/*SSSE3*.cpp",

@@ -156,6 +213,22 @@ INCLUDES = [

"third_party/ktx",

]

+DEPS_UNIX = [

+ ":opts_sse4",

+ ":opts_ssse3",

+DEPS_ANDROID = [

+ ":opts_arm",

+ ":opts_neon",

+DEPS = select({

+ CONDITION_ANDROID: DEPS_ANDROID + EXTERNAL_DEPS_ANDROID,

+ "//conditions:default": DEPS_UNIX + EXTERNAL_DEPS_UNIX,

+})

+# Platform-independent SRCS for DM.

DM_SRCS = glob(

[

"dm/*.cpp",

@@ -188,16 +261,31 @@ DM_SRCS = glob(

"tools/sk_tool_utils.h",

exclude = [

+ "dm/DMSrcSinkAndroid.cpp", # Android-only.

+ "tests/FontMgrAndroidParserTest.cpp", # Android-only.

+ "tests/PathOpsSkpClipTest.cpp", # Alternate main.

"tests/skia_test.cpp", # Old main.

"tests/SkpSkGrTest.cpp", # Alternate main.

- "tests/PathOpsSkpClipTest.cpp", # Alternate main.

- "tests/FontMgrAndroidParserTest.cpp", # Android-only.

- "dm/DMSrcSinkAndroid.cpp", # Android-only.

- "tools/timer/SysTimer_windows.cpp",

"tools/timer/SysTimer_mach.cpp",

+ "tools/timer/SysTimer_windows.cpp",

)

+DM_SRCS_UNIX = []

+DM_SRCS_ANDROID = glob(

+ [

+ # Depends on Android HWUI library that is not available in google3.

+ #"dm/DMSrcSinkAndroid.cpp",

+ "tests/FontMgrAndroidParserTest.cpp",

+ ],

+DM_PLATFORM_SRCS = select({

+ CONDITION_ANDROID: DM_SRCS_ANDROID,

+ "//conditions:default": DM_SRCS_UNIX,

+})

DM_INCLUDES = [

"gm",

"src/codec",

@@ -205,6 +293,7 @@ DM_INCLUDES = [

"src/fonts",

"src/pathops",

"src/pipe/utils",

+ "src/ports",

"src/utils/debugger",

"tests",

"tools",

@@ -212,12 +301,32 @@ DM_INCLUDES = [

"tools/timer",

]

-COPTS = [

+COPTS_ANDROID = [

+COPTS_UNIX = [

"-Wno-implicit-fallthrough", # Some intentional fallthrough.

"-Wno-deprecated-declarations", # Internal use of deprecated methods. :(

]

-DEFINES = [

+COPTS = select({

+ CONDITION_ANDROID: COPTS_ANDROID,

+ "//conditions:default": COPTS_UNIX,

+})

+DEFINES_ANDROID = [

+ "SK_BUILD_FOR_ANDROID",

+ "SK_ARM_HAS_OPTIONAL_NEON",

mtklein 2015/10/21 18:06:06 OOOH right, SK_ARM_HAS_NEON only works if we set -

mtklein 2015/10/22 21:58:32 Can we set -mfpu=neon everywhere?

dogben 2015/10/24 22:05:52 Done.

+ # TODO(benjaminwagner): Try to get png library updated?

+ "SK_PNG_NO_INDEX_SUPPORTED",

+DEFINES_UNIX = [

+ "SK_BUILD_FOR_UNIX",

+ "SK_SAMPLES_FOR_X",

+DEFINES_ALL = [

# It'd be nice for fastbuild, dbg -> SK_DEBUG, opt -> SK_RELEASE.

"SK_RELEASE",

# Chrome DEFINES.

@@ -225,11 +334,20 @@ DEFINES = [

"SK_USE_FREETYPE_EMBOLDEN",

# Turn on a few Google3-specific build fixes.

"GOOGLE3",

- "SK_BUILD_FOR_UNIX",

- "SK_SAMPLES_FOR_X",

]

-LINKOPTS = ["-ldl"]

+DEFINES = select({

+ CONDITION_ANDROID: DEFINES_ANDROID,

+ "//conditions:default": DEFINES_UNIX,

+}) + DEFINES_ALL

+LINKOPTS = select({

+ CONDITION_ANDROID: [

+ "-ldl",

+ "-lEGL",

+ ],

+ "//conditions:default": ["-ldl"],

+})

cc_library(

name = "opts_ssse3",

@@ -248,6 +366,29 @@ cc_library(

)

cc_library(

+ name = "opts_arm",

+ srcs = glob([

+ "src/opts/*_opts_arm.cpp",

+ "src/opts/*_opts_arm.h",

+ ]),

+ copts = COPTS,

+ defines = DEFINES,

+ includes = INCLUDES,

+cc_library(

+ name = "opts_neon",

+ srcs = glob([

+ "src/opts/*neon*.cpp",

+ "src/opts/*neon*.h",

+ "src/opts/Sk4px_NEON.h",

+ ]),

+ copts = COPTS + ["-mfpu=neon"],

+ defines = DEFINES,

+ includes = INCLUDES,

+cc_library(

name = "skia",

srcs = SRCS + PLATFORM_SRCS,

hdrs = HDRS,

@@ -256,16 +397,13 @@ cc_library(

includes = INCLUDES,

linkopts = LINKOPTS,

visibility = [":skia_clients"],

- deps = EXTERNAL_DEPS + [

- ":opts_sse4",

- ":opts_ssse3",

- ],

+ deps = DEPS,

)

cc_test(

name = "dm",

size = "large",

- srcs = DM_SRCS,

+ srcs = DM_SRCS + DM_PLATFORM_SRCS,

args = [

"--nogpu",

"--verbose",

« no previous file with comments | « no previous file | src/pdf/SkPDFFont.cpp » ('j') | no next file with comments »