diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
| commit | c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c (patch) | |
| tree | e9edd581ad60ab80aa5ab423a2a80df652a75792 /skia | |
| parent | 54cd42278ccf1d52996034848086a09b23065a40 (diff) | |
| download | chromium_org-c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c.tar.gz | |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
Diffstat (limited to 'skia')
51 files changed, 1606 insertions, 357 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn new file mode 100644 index 0000000000..7dc5f22bd4 --- /dev/null +++ b/skia/BUILD.gn @@ -0,0 +1,368 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/features.gni") +if (cpu_arch == "arm") { + import("//build/config/arm.gni") +} + +skia_support_gpu = !is_ios +skia_support_pdf = !is_ios && enable_printing != 0 + +# The list of Skia files is kept in skia_gn_files.gypi. Read it. +gypi_values = exec_script("//build/gypi_to_gn.py", + [ rebase_path("skia_gn_files.gypi") ], + "scope", + [ "skia_gn_files.gypi" ]) + +# This files in the skia gypi file are relative to this directory. +skia_dir = "//third_party/skia" + +# Same as skia_dir but relative to the current directory. This is what all +# files will be prefixed to once we rebase them to be relative to our file. If +# you need to filter out a file, prefix it with $skia_rel_dir. +skia_rel_dir = rebase_path(".", ".", skia_dir) + +# External-facing config for dependent code. +config("skia_config") { + include_dirs = [ + "config", + "ext", + "//third_party/skia/include/config", + "//third_party/skia/include/core", + "//third_party/skia/include/effects", + "//third_party/skia/include/images", + "//third_party/skia/include/lazy", + "//third_party/skia/include/pathops", + "//third_party/skia/include/pdf", + "//third_party/skia/include/pipe", + "//third_party/skia/include/ports", + "//third_party/skia/include/utils", + "//third_party/skia/src/core", + "//third_party/skia/src/image", + "//third_party/skia/src/opts", + "//third_party/skia/src/ports", + "//third_party/skia/src/sfnt", + "//third_party/skia/src/utils", + "//third_party/skia/src/lazy", + ] + + defines = gypi_values.skia_feature_defines + + if (component_mode == "shared_library") { + defines += [ "SKIA_DLL" ] + } + + if (skia_support_gpu) { + include_dirs += [ + "//third_party/skia/include/gpu", + "//third_party/skia/src/gpu", + ] + defines += [ "SK_SUPPORT_GPU=1" ] + } else { + defines += [ "SK_SUPPORT_GPU=0" ] + } + + # For POSIX platforms, prefer the Mutex implementation provided by Skia + # since it does not generate static initializers. + if (is_posix) { + defines += [ "SK_USE_POSIX_THREADS" ] + } + + if (is_android) { + defines += [ + "SK_BUILD_FOR_ANDROID", + "USE_CHROMIUM_SKIA", + ] + } +} + +config("skia_dependent_config") { +} + +# Internal-facing config for Skia library code. +config("skia_library_config") { + defines = [ + #skia_export_defines ???) TODO + + # skia uses static initializers to initialize the serialization logic + # of its "pictures" library. This is currently not used in chrome; if + # it ever gets used the processes that use it need to call + # SkGraphics::Init(). + "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0", + + # Disable this check because it is too strict for some Chromium-specific + # subclasses of SkPixelRef. See bug: crbug.com/171776. + "SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK", + + "IGNORE_ROT_AA_RECT_OPT", + + # Forces Skia not to use typographic metrics with GDI. + "SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS", + ] + + # Settings for text blitting, chosen to approximate the system browser. + if (is_linux) { + defines += [ + "SK_GAMMA_EXPONENT=1.2", + "SK_GAMMA_CONTRAST=0.2", + ] + } else if (is_android) { + defines += [ + "SK_GAMMA_APPLY_TO_A8", + "SK_GAMMA_EXPONENT=1.4", + "SK_GAMMA_CONTRAST=0.0", + ] + } else if (is_win) { + defines += [ + "SK_GAMMA_SRGB", + "SK_GAMMA_CONTRAST=0.5", + ] + } else if (is_mac) { + defines += [ + "SK_GAMMA_SRGB", + "SK_GAMMA_CONTRAST=0.0", + ] + } + + if (is_android) { + defines += [ + # Android devices are typically more memory constrained, so default to a + # smaller glyph cache (it may be overriden at runtime when the renderer + # starts up, depending on the actual device memory). + "SK_DEFAULT_FONT_CACHE_LIMIT=1048576" # 1024 * 1024 + ] + } else { + defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ] # 20 * 1024 * 1024 + } + + if (is_win) { + include_dirs = [ + "//third_party/skia/include/utils/win", + "//third_party/skia/src/utils/win", + ] + + defines += [ "SK_FONTHOST_USES_FONTMGR" ] + + cflags = [ + # TODO(brettw) comment what these are. + "/wd4244", + "/wd4267", + "/wd4341", + "/wd4345", + "/wd4390", + "/wd4554", + "/wd4748", + "/wd4800", + ] + } +} + +component("skia") { + sources = [ + # Chrome sources. + "ext/analysis_canvas.cc", + "ext/analysis_canvas.h", + "ext/benchmarking_canvas.cc", + "ext/benchmarking_canvas.h", + "ext/bitmap_platform_device.h", + "ext/bitmap_platform_device_cairo.cc", + "ext/bitmap_platform_device_cairo.h", + "ext/bitmap_platform_device_mac.cc", + "ext/bitmap_platform_device_mac.h", + #"ext/bitmap_platform_device_skia.cc", + #"ext/bitmap_platform_device_skia.h", + "ext/bitmap_platform_device_win.cc", + "ext/bitmap_platform_device_win.h", + "ext/convolver.cc", + "ext/convolver.h", + "ext/event_tracer_impl.cc", + "ext/event_tracer_impl.h", + "ext/google_logging.cc", + "ext/image_operations.cc", + "ext/image_operations.h", + "ext/lazy_pixel_ref.cc", + "ext/lazy_pixel_ref.h", + "ext/SkThread_chrome.cc", + "ext/opacity_draw_filter.cc", + "ext/opacity_draw_filter.h", + "ext/paint_simplifier.cc", + "ext/paint_simplifier.h", + "ext/pixel_ref_utils.cc", + "ext/pixel_ref_utils.h", + "ext/platform_canvas.cc", + "ext/platform_canvas.h", + "ext/platform_device.cc", + "ext/platform_device.h", + "ext/platform_device_linux.cc", + "ext/platform_device_mac.cc", + "ext/platform_device_win.cc", + "ext/recursive_gaussian_convolution.cc", + "ext/recursive_gaussian_convolution.h", + "ext/refptr.h", + "ext/SkDiscardableMemory_chrome.h", + "ext/SkDiscardableMemory_chrome.cc", + "ext/SkMemory_new_handler.cpp", + "ext/skia_trace_shim.h", + "ext/skia_utils_base.cc", + "ext/skia_utils_base.h", + "ext/skia_utils_ios.mm", + "ext/skia_utils_ios.h", + "ext/skia_utils_mac.mm", + "ext/skia_utils_mac.h", + "ext/skia_utils_win.cc", + "ext/skia_utils_win.h", + "ext/vector_canvas.h", + "ext/vector_platform_device_emf_win.cc", + "ext/vector_platform_device_emf_win.h", + "ext/vector_platform_device_skia.cc", + "ext/vector_platform_device_skia.h", + ] + + # The skia gypi values are relative to the skia_dir, so we need to rebase. + sources += rebase_path(gypi_values.skia_core_sources, ".", skia_dir) + sources += rebase_path(gypi_values.skia_effects_sources, ".", skia_dir) + sources += rebase_path(gypi_values.skia_pdf_sources, ".", skia_dir) + sources += rebase_path(gypi_values.skia_library_sources, ".", skia_dir) + + # GPU + if (skia_support_gpu) { + sources += rebase_path(gypi_values.skia_gpu_sources, ".", skia_dir) + } + + # Fixup Chrome sources. + if (is_posix) { + sources -= [ "ext/SkThread_chrome.cc" ] + } + if (is_ios) { + sources -= [ "ext/vector_platform_device_skia.cc" ] + } + if (is_win) { + sources -= [ "ext/SkThread_chrome.cc" ] + } + if (is_android && enable_printing == 0) { + sources -= [ + "ext/skia_utils_base.cc", + "ext/vector_platform_device_skia.cc" + ] + } + + # Fixup skia library sources. + if (is_win) { + sources -= [ + "$skia_rel_dir/src/ports/SkOSFile_posix.cpp", + "$skia_rel_dir/src/ports/SkTime_Unix.cpp", + "$skia_rel_dir/src/ports/SkTLS_pthread.cpp", + "$skia_rel_dir/src/ports/SkFontConfigInterface_direct.cpp", + "$skia_rel_dir/src/fonts/SkFontMgr_fontconfig.cpp", + ] + } else { + sources -= [ + "$skia_rel_dir/src/ports/SkFontHost_win.cpp", + "$skia_rel_dir/src/ports/SkFontHost_win_dw.cpp", + "$skia_rel_dir/src/ports/SkFontMgr_default_gdi.cpp", + "$skia_rel_dir/src/ports/SkOSFile_win.cpp", + "$skia_rel_dir/src/ports/SkThread_win.cpp", + "$skia_rel_dir/src/ports/SkTLS_win.cpp", + "$skia_rel_dir/src/utils/SkThreadUtils_win.cpp", + ] + } + if (!is_android) { + sources -= [ + "$skia_rel_dir/src/ports/SkFontConfigInterface_android.cpp", + "$skia_rel_dir/src/ports/SkFontConfigParser_android.cpp", + ] + } + if (!is_mac) { + sources -= [ + "$skia_rel_dir/src/ports/SkFontHost_mac.cpp", + "$skia_rel_dir/src/utils/SkThreadUtils_pthread_mach.cpp", + ] + } + if (!is_linux) { + sources -= [ + "$skia_rel_dir/src/ports/SkFontHost_FreeType.cpp", + "$skia_rel_dir/src/ports/SkFontHost_FreeType_common.cpp", + "$skia_rel_dir/src/ports/SkFontHost_fontconfig.cpp", + "$skia_rel_dir/src/ports/SkFontHost_linux.cpp", + ] + } else if (!is_android) { + sources -= [ + "$skia_rel_dir/src/ports/SkFontConfigInterface_direct.cpp", + "$skia_rel_dir/src/fonts/SkFontMgr_fontconfig.cpp", + ] + } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_library_config", + "//build/config/compiler:no_chromium_code" + ] + direct_dependent_configs = [ ":skia_config" ] + + deps = [ + ":skia_opts", + "//base", + "//base/third_party/dynamic_annotations", + "//third_party/zlib", + ] + + if (component_mode == "shared_library") { + defines = [ "SKIA_IMPLEMENTATION=1" ] + } + + if (is_linux) { + configs += [ + "//build/config/linux:fontconfig", + "//build/config/linux:freetype2", + "//build/config/linux:pangocairo", + ] + deps += [ + "//third_party/icu:icuuc", + ] + } + + if (skia_support_pdf) { + deps += [ "//third_party/sfntly" ] + } +} + +# Separated out so it can be compiled with different flags for SSE. +source_set("skia_opts") { + if (cpu_arch == "x86" || cpu_arch == "x64") { + sources = [ + # SSE 2 + "//third_party/skia/src/opts/opts_check_SSE2.cpp", + "//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkUtils_opts_SSE2.cpp", + "//third_party/skia/src/opts/SkXfermode_opts_none.cpp", + + # SSE 3 + "//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp", + + # Chrome-specific. + "ext/convolver_SSE2.cc", + ] + + if (is_linux || is_mac) { + cflags = [ "-mssse3" ] # Note third 's'. + } + } else { + assert(false, "Need to port ARM/MIPS stuff from skia_library_opts.gyp") + } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + ":skia_config", + "//build/config/compiler:no_chromium_code" + ] + + # TODO(brettw) uncomment when visibility is supported. + #visibility = ":skia" +} diff --git a/skia/ext/SkMemory_new_handler.cpp b/skia/ext/SkMemory_new_handler.cpp index a142f2994e..015521f313 100644 --- a/skia/ext/SkMemory_new_handler.cpp +++ b/skia/ext/SkMemory_new_handler.cpp @@ -50,13 +50,15 @@ void* sk_malloc_throw(size_t size) { return throw_on_failure(size, malloc(size)); } -// Platform specific ways to try really hard to get a malloc that won't crash on failure. static void* sk_malloc_nothrow(size_t size) { -#if defined(ANDROID) - // Android doesn't have std::set_new_handler, so we just call malloc. - return malloc(size); -#elif defined(OS_MACOSX) && !defined(OS_IOS) - return base::UncheckedMalloc(size); + // TODO(b.kelemen): we should always use UncheckedMalloc but currently it + // doesn't work as intended everywhere. +#if defined(LIBC_GLIBC) || defined(USE_TCMALLOC) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID) + void* result; + // It's the responsibility of the caller to check the return value. + ignore_result(base::UncheckedMalloc(size, &result)); + return result; #else // This is not really thread safe. It only won't collide with itself, but we're totally // unprotected from races with other code that calls set_new_handler. @@ -79,12 +81,15 @@ void* sk_calloc_throw(size_t size) { return throw_on_failure(size, calloc(size, 1)); } -// Jump through the same hoops as sk_malloc_nothrow to avoid a crash, but for calloc. void* sk_calloc(size_t size) { -#if defined(ANDROID) - return calloc(size, 1); -#elif defined(OS_MACOSX) && !defined(OS_IOS) - return base::UncheckedCalloc(size, 1); + // TODO(b.kelemen): we should always use UncheckedCalloc but currently it + // doesn't work as intended everywhere. +#if defined(LIBC_GLIBC) || defined(USE_TCMALLOC) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID) + void* result; + // It's the responsibility of the caller to check the return value. + ignore_result(base::UncheckedCalloc(size, 1, &result)); + return result; #else SkAutoMutexAcquire lock(gSkNewHandlerMutex); std::new_handler old_handler = std::set_new_handler(NULL); diff --git a/skia/ext/pixel_ref_utils.cc b/skia/ext/pixel_ref_utils.cc index 22d42e7a5a..69fa405e38 100644 --- a/skia/ext/pixel_ref_utils.cc +++ b/skia/ext/pixel_ref_utils.cc @@ -314,15 +314,6 @@ class GatherPixelRefDevice : public SkBitmapDevice { const SkPaint&) SK_OVERRIDE {} protected: -#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG - virtual bool onReadPixels(const SkBitmap& bitmap, - int x, - int y, - SkCanvas::Config8888 config8888) SK_OVERRIDE { - return false; - } -#endif - virtual bool onReadPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, diff --git a/skia/skia.target.darwin-arm.mk b/skia/skia.target.darwin-arm.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.darwin-arm.mk +++ b/skia/skia.target.darwin-arm.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.darwin-mips.mk b/skia/skia.target.darwin-mips.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.darwin-mips.mk +++ b/skia/skia.target.darwin-mips.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.darwin-x86.mk b/skia/skia.target.darwin-x86.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.darwin-x86.mk +++ b/skia/skia.target.darwin-x86.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.darwin-x86_64.mk b/skia/skia.target.darwin-x86_64.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.darwin-x86_64.mk +++ b/skia/skia.target.darwin-x86_64.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.linux-arm.mk b/skia/skia.target.linux-arm.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.linux-arm.mk +++ b/skia/skia.target.linux-arm.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.linux-mips.mk b/skia/skia.target.linux-mips.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.linux-mips.mk +++ b/skia/skia.target.linux-mips.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.linux-x86.mk b/skia/skia.target.linux-x86.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.linux-x86.mk +++ b/skia/skia.target.linux-x86.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia.target.linux-x86_64.mk b/skia/skia.target.linux-x86_64.mk index 96515a86d0..d68f293fae 100644 --- a/skia/skia.target.linux-x86_64.mk +++ b/skia/skia.target.linux-x86_64.mk @@ -7,13 +7,14 @@ LOCAL_MODULE := skia_skia_gyp LOCAL_MODULE_STEM := skia LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_chrome_gyp.a GYP_GENERATED_OUTPUTS := @@ -31,6 +32,7 @@ skia: skia_skia_gyp LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) include $(BUILD_SYSTEM)/base_rules.mk @@ -38,3 +40,5 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide) echo "Gyp timestamp: $@" $(hide) mkdir -p $(dir $@) $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk index ff2d67eda0..82748e43e3 100644 --- a/skia/skia_chrome.target.darwin-arm.mk +++ b/skia/skia_chrome.target.darwin-arm.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -109,10 +110,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -261,6 +259,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -313,9 +312,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -332,9 +331,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk index 46a24083d8..66b8e4e10b 100644 --- a/skia/skia_chrome.target.darwin-mips.mk +++ b/skia/skia_chrome.target.darwin-mips.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -109,10 +110,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -131,6 +130,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -237,10 +237,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -259,6 +257,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk index 75a152e6b7..07bad8f171 100644 --- a/skia/skia_chrome.target.darwin-x86.mk +++ b/skia/skia_chrome.target.darwin-x86.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -110,10 +111,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -260,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_chrome.target.darwin-x86_64.mk b/skia/skia_chrome.target.darwin-x86_64.mk index c0c59b0ba8..0ec06c3369 100644 --- a/skia/skia_chrome.target.darwin-x86_64.mk +++ b/skia/skia_chrome.target.darwin-x86_64.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -110,10 +111,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -260,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk index ff2d67eda0..82748e43e3 100644 --- a/skia/skia_chrome.target.linux-arm.mk +++ b/skia/skia_chrome.target.linux-arm.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -109,10 +110,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -261,6 +259,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -313,9 +312,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -332,9 +331,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk index 46a24083d8..66b8e4e10b 100644 --- a/skia/skia_chrome.target.linux-mips.mk +++ b/skia/skia_chrome.target.linux-mips.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -109,10 +110,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -131,6 +130,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -237,10 +237,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -259,6 +257,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk index 75a152e6b7..07bad8f171 100644 --- a/skia/skia_chrome.target.linux-x86.mk +++ b/skia/skia_chrome.target.linux-x86.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -110,10 +111,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -260,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_chrome.target.linux-x86_64.mk b/skia/skia_chrome.target.linux-x86_64.mk index c0c59b0ba8..0ec06c3369 100644 --- a/skia/skia_chrome.target.linux-x86_64.mk +++ b/skia/skia_chrome.target.linux-x86_64.mk @@ -6,12 +6,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -110,10 +111,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,10 +238,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -260,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -311,9 +310,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -328,9 +327,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_chrome_opts.target.darwin-arm.mk b/skia/skia_chrome_opts.target.darwin-arm.mk index b245853cdf..d2482e1727 100644 --- a/skia/skia_chrome_opts.target.darwin-arm.mk +++ b/skia/skia_chrome_opts.target.darwin-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -20,9 +21,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -39,9 +40,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_chrome_opts.target.darwin-mips.mk b/skia/skia_chrome_opts.target.darwin-mips.mk index 823680209a..4c7996e1dc 100644 --- a/skia/skia_chrome_opts.target.darwin-mips.mk +++ b/skia/skia_chrome_opts.target.darwin-mips.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -213,9 +214,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -230,9 +231,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_chrome_opts.target.darwin-x86.mk b/skia/skia_chrome_opts.target.darwin-x86.mk index 0d1bd0fa3e..8a8b6d52ef 100644 --- a/skia/skia_chrome_opts.target.darwin-x86.mk +++ b/skia/skia_chrome_opts.target.darwin-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -211,9 +212,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -228,9 +229,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_chrome_opts.target.darwin-x86_64.mk b/skia/skia_chrome_opts.target.darwin-x86_64.mk index 3da37dc918..140b85a15c 100644 --- a/skia/skia_chrome_opts.target.darwin-x86_64.mk +++ b/skia/skia_chrome_opts.target.darwin-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -211,9 +212,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -228,9 +229,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_chrome_opts.target.linux-arm.mk b/skia/skia_chrome_opts.target.linux-arm.mk index b245853cdf..d2482e1727 100644 --- a/skia/skia_chrome_opts.target.linux-arm.mk +++ b/skia/skia_chrome_opts.target.linux-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -20,9 +21,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -39,9 +40,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_chrome_opts.target.linux-mips.mk b/skia/skia_chrome_opts.target.linux-mips.mk index 823680209a..4c7996e1dc 100644 --- a/skia/skia_chrome_opts.target.linux-mips.mk +++ b/skia/skia_chrome_opts.target.linux-mips.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -213,9 +214,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -230,9 +231,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_chrome_opts.target.linux-x86.mk b/skia/skia_chrome_opts.target.linux-x86.mk index 0d1bd0fa3e..8a8b6d52ef 100644 --- a/skia/skia_chrome_opts.target.linux-x86.mk +++ b/skia/skia_chrome_opts.target.linux-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -211,9 +212,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -228,9 +229,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_chrome_opts.target.linux-x86_64.mk b/skia/skia_chrome_opts.target.linux-x86_64.mk index 3da37dc918..140b85a15c 100644 --- a/skia/skia_chrome_opts.target.linux-x86_64.mk +++ b/skia/skia_chrome_opts.target.linux-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_chrome_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -211,9 +212,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -228,9 +229,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 1459627337..77624c0b9f 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -152,7 +152,6 @@ 'SK_ENABLE_LEGACY_API_ALIASING=1', 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 'GR_GL_IGNORE_ES3_MSAA=0', - 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', 'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT', # This variable contains additional defines, specified in skia's diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi new file mode 100644 index 0000000000..60e5fd91d2 --- /dev/null +++ b/skia/skia_gn_files.gypi @@ -0,0 +1,880 @@ +# This file is read into the GN build. + +# Files are relative to third_party/skia. +{ + # Shared defines for all builds. + 'skia_feature_defines': [ + 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', + 'GR_GL_IGNORE_ES3_MSAA=0', + 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', + 'SK_DEFERRED_CANVAS_USES_FACTORIES=1', + 'SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION', + 'SK_ENABLE_INST_COUNT=0', + 'SK_ENABLE_LEGACY_API_ALIASING=1', + 'SK_HIGH_QUALITY_IS_LANCZOS', + 'SK_IGNORE_BLURRED_RRECT_OPT', + 'SK_IGNORE_QUAD_RR_CORNERS_OPT', + 'SK_SUPPORT_LEGACY_GETCLIPTYPE', + 'SK_SUPPORT_LEGACY_GETTOPDEVICE', + 'SK_SUPPORT_LEGACY_GETTOTALCLIP', + 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', + 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', + 'SK_USE_DISCARDABLE_SCALEDIMAGECACHE', + 'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT', + ], + + 'skia_gpu_sources': [ + 'include/gpu/GrBackendEffectFactory.h', + 'include/gpu/GrClipData.h', + 'include/gpu/GrColor.h', + 'include/gpu/GrConfig.h', + 'include/gpu/GrContext.h', + 'include/gpu/GrContextFactory.h', + 'include/gpu/GrCoordTransform.h', + 'include/gpu/GrEffect.h', + 'include/gpu/GrEffectStage.h', + 'include/gpu/GrEffectUnitTest.h', + 'include/gpu/GrFontScaler.h', + 'include/gpu/GrGlyph.h', + 'include/gpu/GrKey.h', + 'include/gpu/GrPaint.h', + 'include/gpu/GrPathRendererChain.h', + 'include/gpu/GrPoint.h', + 'include/gpu/GrRect.h', + 'include/gpu/GrRenderTarget.h', + 'include/gpu/GrResource.h', + 'include/gpu/GrSurface.h', + 'include/gpu/GrTBackendEffectFactory.h', + 'include/gpu/GrTexture.h', + 'include/gpu/GrTextureAccess.h', + 'include/gpu/GrTypes.h', + 'include/gpu/GrUserConfig.h', + + 'include/gpu/gl/GrGLConfig.h', + 'include/gpu/gl/GrGLExtensions.h', + 'include/gpu/gl/GrGLFunctions.h', + 'include/gpu/gl/GrGLInterface.h', + + 'src/gpu/GrAAHairLinePathRenderer.cpp', + 'src/gpu/GrAAHairLinePathRenderer.h', + 'src/gpu/GrAAConvexPathRenderer.cpp', + 'src/gpu/GrAAConvexPathRenderer.h', + 'src/gpu/GrAARectRenderer.cpp', + 'src/gpu/GrAARectRenderer.h', + 'src/gpu/GrAddPathRenderers_default.cpp', + 'src/gpu/GrAllocator.h', + 'src/gpu/GrAllocPool.h', + 'src/gpu/GrAllocPool.cpp', + 'src/gpu/GrAtlas.cpp', + 'src/gpu/GrAtlas.h', + 'src/gpu/GrBinHashKey.h', + 'src/gpu/GrBitmapTextContext.cpp', + 'src/gpu/GrBitmapTextContext.h', + 'src/gpu/GrBlend.cpp', + 'src/gpu/GrBlend.h', + 'src/gpu/GrBufferAllocPool.cpp', + 'src/gpu/GrBufferAllocPool.h', + 'src/gpu/GrCacheID.cpp', + 'src/gpu/GrClipData.cpp', + 'src/gpu/GrContext.cpp', + 'src/gpu/GrDefaultPathRenderer.cpp', + 'src/gpu/GrDefaultPathRenderer.h', + 'src/gpu/GrDistanceFieldTextContext.h', + 'src/gpu/GrDistanceFieldTextContext.cpp', + 'src/gpu/GrDrawState.cpp', + 'src/gpu/GrDrawState.h', + 'src/gpu/GrDrawTarget.cpp', + 'src/gpu/GrDrawTarget.h', + 'src/gpu/GrDrawTargetCaps.h', + 'src/gpu/GrEffect.cpp', + 'src/gpu/GrGeometryBuffer.h', + 'src/gpu/GrClipMaskCache.h', + 'src/gpu/GrClipMaskCache.cpp', + 'src/gpu/GrClipMaskManager.h', + 'src/gpu/GrClipMaskManager.cpp', + 'src/gpu/GrGpu.cpp', + 'src/gpu/GrGpu.h', + 'src/gpu/GrGpuFactory.cpp', + 'src/gpu/GrIndexBuffer.h', + 'src/gpu/GrInOrderDrawBuffer.cpp', + 'src/gpu/GrInOrderDrawBuffer.h', + 'src/gpu/GrLayerCache.cpp', + 'src/gpu/GrLayerCache.h', + 'src/gpu/GrMemoryPool.cpp', + 'src/gpu/GrMemoryPool.h', + 'src/gpu/GrOrderedSet.h', + 'src/gpu/GrOvalRenderer.cpp', + 'src/gpu/GrOvalRenderer.h', + 'src/gpu/GrPaint.cpp', + 'src/gpu/GrPath.cpp', + 'src/gpu/GrPath.h', + 'src/gpu/GrPathRendererChain.cpp', + 'src/gpu/GrPathRenderer.cpp', + 'src/gpu/GrPathRenderer.h', + 'src/gpu/GrPathUtils.cpp', + 'src/gpu/GrPathUtils.h', + 'src/gpu/GrPictureUtils.h', + 'src/gpu/GrPictureUtils.cpp', + 'src/gpu/GrPlotMgr.h', + 'src/gpu/GrRectanizer.cpp', + 'src/gpu/GrRectanizer.h', + 'src/gpu/GrRectanizer_skyline.cpp', + 'src/gpu/GrRedBlackTree.h', + 'src/gpu/GrRenderTarget.cpp', + 'src/gpu/GrReducedClip.cpp', + 'src/gpu/GrReducedClip.h', + 'src/gpu/GrResource.cpp', + 'src/gpu/GrResourceCache.cpp', + 'src/gpu/GrResourceCache.h', + 'src/gpu/GrStencil.cpp', + 'src/gpu/GrStencil.h', + 'src/gpu/GrStencilAndCoverPathRenderer.cpp', + 'src/gpu/GrStencilAndCoverPathRenderer.h', + 'src/gpu/GrStencilBuffer.cpp', + 'src/gpu/GrStencilBuffer.h', + 'src/gpu/GrTBSearch.h', + 'src/gpu/GrTraceMarker.cpp', + 'src/gpu/GrTraceMarker.h', + 'src/gpu/GrTracing.h', + 'src/gpu/GrSWMaskHelper.cpp', + 'src/gpu/GrSWMaskHelper.h', + 'src/gpu/GrSoftwarePathRenderer.cpp', + 'src/gpu/GrSoftwarePathRenderer.h', + 'src/gpu/GrSurface.cpp', + 'src/gpu/GrTemplates.h', + 'src/gpu/GrTextContext.cpp', + 'src/gpu/GrTextContext.h', + 'src/gpu/GrTextStrike.cpp', + 'src/gpu/GrTextStrike.h', + 'src/gpu/GrTextStrike_impl.h', + 'src/gpu/GrTexture.cpp', + 'src/gpu/GrTextureAccess.cpp', + 'src/gpu/GrTHashTable.h', + 'src/gpu/GrVertexBuffer.h', + + 'src/gpu/effects/Gr1DKernelEffect.h', + 'src/gpu/effects/GrConfigConversionEffect.cpp', + 'src/gpu/effects/GrConfigConversionEffect.h', + 'src/gpu/effects/GrBezierEffect.cpp', + 'src/gpu/effects/GrBezierEffect.h', + 'src/gpu/effects/GrConvolutionEffect.cpp', + 'src/gpu/effects/GrConvolutionEffect.h', + 'src/gpu/effects/GrConvexPolyEffect.cpp', + 'src/gpu/effects/GrConvexPolyEffect.h', + 'src/gpu/effects/GrBicubicEffect.cpp', + 'src/gpu/effects/GrBicubicEffect.h', + 'src/gpu/effects/GrCustomCoordsTextureEffect.cpp', + 'src/gpu/effects/GrCustomCoordsTextureEffect.h', + 'src/gpu/effects/GrDistanceFieldTextureEffect.cpp', + 'src/gpu/effects/GrDistanceFieldTextureEffect.h', + 'src/gpu/effects/GrOvalEffect.cpp', + 'src/gpu/effects/GrOvalEffect.h', + 'src/gpu/effects/GrRRectEffect.cpp', + 'src/gpu/effects/GrRRectEffect.h', + 'src/gpu/effects/GrSimpleTextureEffect.cpp', + 'src/gpu/effects/GrSimpleTextureEffect.h', + 'src/gpu/effects/GrSingleTextureEffect.cpp', + 'src/gpu/effects/GrSingleTextureEffect.h', + 'src/gpu/effects/GrTextureDomain.cpp', + 'src/gpu/effects/GrTextureDomain.h', + 'src/gpu/effects/GrTextureStripAtlas.cpp', + 'src/gpu/effects/GrTextureStripAtlas.h', + + 'src/gpu/gl/GrGLBufferImpl.cpp', + 'src/gpu/gl/GrGLBufferImpl.h', + 'src/gpu/gl/GrGLCaps.cpp', + 'src/gpu/gl/GrGLCaps.h', + 'src/gpu/gl/GrGLContext.cpp', + 'src/gpu/gl/GrGLContext.h', + 'src/gpu/gl/GrGLCreateNativeInterface_none.cpp', + 'src/gpu/gl/GrGLDefaultInterface_none.cpp', + 'src/gpu/gl/GrGLDefines.h', + 'src/gpu/gl/GrGLEffect.h', + 'src/gpu/gl/GrGLVertexEffect.h', + 'src/gpu/gl/GrGLExtensions.cpp', + 'src/gpu/gl/GrGLIndexBuffer.cpp', + 'src/gpu/gl/GrGLIndexBuffer.h', + 'src/gpu/gl/GrGLInterface.cpp', + 'src/gpu/gl/GrGLIRect.h', + 'src/gpu/gl/GrGLNoOpInterface.cpp', + 'src/gpu/gl/GrGLNoOpInterface.h', + 'src/gpu/gl/GrGLPath.cpp', + 'src/gpu/gl/GrGLPath.h', + 'src/gpu/gl/GrGLProgram.cpp', + 'src/gpu/gl/GrGLProgram.h', + 'src/gpu/gl/GrGLProgramDesc.cpp', + 'src/gpu/gl/GrGLProgramDesc.h', + 'src/gpu/gl/GrGLProgramEffects.cpp', + 'src/gpu/gl/GrGLProgramEffects.h', + 'src/gpu/gl/GrGLRenderTarget.cpp', + 'src/gpu/gl/GrGLRenderTarget.h', + 'src/gpu/gl/GrGLShaderBuilder.cpp', + 'src/gpu/gl/GrGLShaderBuilder.h', + 'src/gpu/gl/GrGLShaderVar.h', + 'src/gpu/gl/GrGLSL.cpp', + 'src/gpu/gl/GrGLSL.h', + 'src/gpu/gl/GrGLSL_impl.h', + 'src/gpu/gl/GrGLStencilBuffer.cpp', + 'src/gpu/gl/GrGLStencilBuffer.h', + 'src/gpu/gl/GrGLTexture.cpp', + 'src/gpu/gl/GrGLTexture.h', + 'src/gpu/gl/GrGLUtil.cpp', + 'src/gpu/gl/GrGLUtil.h', + 'src/gpu/gl/GrGLUniformManager.cpp', + 'src/gpu/gl/GrGLUniformManager.h', + 'src/gpu/gl/GrGLUniformHandle.h', + 'src/gpu/gl/GrGLVertexArray.cpp', + 'src/gpu/gl/GrGLVertexArray.h', + 'src/gpu/gl/GrGLVertexBuffer.cpp', + 'src/gpu/gl/GrGLVertexBuffer.h', + 'src/gpu/gl/GrGpuGL.cpp', + 'src/gpu/gl/GrGpuGL.h', + 'src/gpu/gl/GrGpuGL_program.cpp', + + # Sk files + 'include/gpu/SkGpuDevice.h', + 'include/gpu/SkGr.h', + 'include/gpu/SkGrPixelRef.h', + 'include/gpu/SkGrTexturePixelRef.h', + + 'include/gpu/gl/SkGLContextHelper.h', + + 'src/gpu/SkGpuDevice.cpp', + 'src/gpu/SkGr.cpp', + 'src/gpu/SkGrFontScaler.cpp', + 'src/gpu/SkGrPixelRef.cpp', + 'src/gpu/SkGrTexturePixelRef.cpp', + + 'src/image/SkImage_Gpu.cpp', + 'src/image/SkSurface_Gpu.cpp', + + 'src/gpu/gl/SkGLContextHelper.cpp' + ], + + 'skia_core_sources': [ + 'src/core/ARGB32_Clamp_Bilinear_BitmapShader.h', + 'src/core/SkAAClip.cpp', + 'src/core/SkAnnotation.cpp', + 'src/core/SkAdvancedTypefaceMetrics.cpp', + 'src/core/SkAlphaRuns.cpp', + 'src/core/SkAntiRun.h', + 'src/core/SkBBoxHierarchy.h', + 'src/core/SkBBoxRecord.cpp', + 'src/core/SkBBoxRecord.h', + 'src/core/SkBBoxHierarchyRecord.cpp', + 'src/core/SkBBoxHierarchyRecord.h', + 'src/core/SkBitmap.cpp', + 'src/core/SkBitmapDevice.cpp', + 'src/core/SkBitmapFilter.h', + 'src/core/SkBitmapFilter.cpp', + 'src/core/SkBitmapHeap.cpp', + 'src/core/SkBitmapHeap.h', + 'src/core/SkBitmapProcShader.cpp', + 'src/core/SkBitmapProcShader.h', + 'src/core/SkBitmapProcState.cpp', + 'src/core/SkBitmapProcState.h', + 'src/core/SkBitmapProcState_matrix.h', + 'src/core/SkBitmapProcState_matrixProcs.cpp', + 'src/core/SkBitmapProcState_sample.h', + 'src/core/SkBitmapScaler.h', + 'src/core/SkBitmapScaler.cpp', + 'src/core/SkBitmapShader16BilerpTemplate.h', + 'src/core/SkBitmapShaderTemplate.h', + 'src/core/SkBitmap_scroll.cpp', + 'src/core/SkBlitBWMaskTemplate.h', + 'src/core/SkBlitMask_D32.cpp', + 'src/core/SkBlitRow_D16.cpp', + 'src/core/SkBlitRow_D32.cpp', + 'src/core/SkBlitter.h', + 'src/core/SkBlitter.cpp', + 'src/core/SkBlitter_A8.cpp', + 'src/core/SkBlitter_ARGB32.cpp', + 'src/core/SkBlitter_RGB16.cpp', + 'src/core/SkBlitter_Sprite.cpp', + 'src/core/SkBuffer.cpp', + 'src/core/SkCanvas.cpp', + 'src/core/SkChunkAlloc.cpp', + 'src/core/SkClipStack.cpp', + 'src/core/SkColor.cpp', + 'src/core/SkColorFilter.cpp', + 'src/core/SkColorTable.cpp', + 'src/core/SkComposeShader.cpp', + 'src/core/SkConfig8888.cpp', + 'src/core/SkConfig8888.h', + 'src/core/SkConvolver.cpp', + 'src/core/SkConvolver.h', + 'src/core/SkCoreBlitters.h', + 'src/core/SkCubicClipper.cpp', + 'src/core/SkCubicClipper.h', + 'src/core/SkData.cpp', + 'src/core/SkDataTable.cpp', + 'src/core/SkDebug.cpp', + 'src/core/SkDeque.cpp', + 'src/core/SkDevice.cpp', + 'src/core/SkDeviceLooper.cpp', + 'src/core/SkDeviceProfile.cpp', + 'src/lazy/SkDiscardableMemoryPool.cpp', + 'src/lazy/SkDiscardablePixelRef.cpp', + 'src/core/SkDistanceFieldGen.cpp', + 'src/core/SkDistanceFieldGen.h', + 'src/core/SkDither.cpp', + 'src/core/SkDraw.cpp', + 'src/core/SkDrawLooper.cpp', + 'src/core/SkDrawProcs.h', + 'src/core/SkEdgeBuilder.cpp', + 'src/core/SkEdgeClipper.cpp', + 'src/core/SkEdge.cpp', + 'src/core/SkEdge.h', + 'src/core/SkError.cpp', + 'src/core/SkErrorInternals.h', + 'src/core/SkFilterProc.cpp', + 'src/core/SkFilterProc.h', + 'src/core/SkFilterShader.cpp', + 'src/core/SkFlattenable.cpp', + 'src/core/SkFlattenableSerialization.cpp', + 'src/core/SkFloat.cpp', + 'src/core/SkFloat.h', + 'src/core/SkFloatBits.cpp', + 'src/core/SkFontHost.cpp', + 'src/core/SkFontDescriptor.cpp', + 'src/core/SkFontDescriptor.h', + 'src/core/SkFontStream.cpp', + 'src/core/SkFontStream.h', + 'src/core/SkGeometry.cpp', + 'src/core/SkGlyphCache.cpp', + 'src/core/SkGlyphCache.h', + 'src/core/SkGlyphCache_Globals.h', + 'src/core/SkGraphics.cpp', + 'src/core/SkInstCnt.cpp', + 'src/core/SkImageFilter.cpp', + 'src/core/SkImageInfo.cpp', + 'src/core/SkLineClipper.cpp', + 'src/core/SkMallocPixelRef.cpp', + 'src/core/SkMask.cpp', + 'src/core/SkMaskFilter.cpp', + 'src/core/SkMaskGamma.cpp', + 'src/core/SkMaskGamma.h', + 'src/core/SkMath.cpp', + 'src/core/SkMatrix.cpp', + 'src/core/SkMatrixClipStateMgr.cpp', + 'src/core/SkMatrixClipStateMgr.h', + 'src/core/SkMessageBus.h', + 'src/core/SkMetaData.cpp', + 'src/core/SkMipMap.cpp', + 'src/core/SkOffsetTable.h', + 'src/core/SkPackBits.cpp', + 'src/core/SkPaint.cpp', + 'src/core/SkPaintOptionsAndroid.cpp', + 'src/core/SkPaintPriv.cpp', + 'src/core/SkPaintPriv.h', + 'src/core/SkPath.cpp', + 'src/core/SkPathEffect.cpp', + 'src/core/SkPathHeap.cpp', + 'src/core/SkPathHeap.h', + 'src/core/SkPathMeasure.cpp', + 'src/core/SkPathRef.cpp', + 'src/core/SkPicture.cpp', + 'src/core/SkPictureFlat.cpp', + 'src/core/SkPictureFlat.h', + 'src/core/SkPicturePlayback.cpp', + 'src/core/SkPicturePlayback.h', + 'src/core/SkPictureRecord.cpp', + 'src/core/SkPictureRecord.h', + 'src/core/SkPictureStateTree.cpp', + 'src/core/SkPictureStateTree.h', + 'src/core/SkPixelRef.cpp', + 'src/core/SkPoint.cpp', + 'src/core/SkProcSpriteBlitter.cpp', + 'src/core/SkPtrRecorder.cpp', + 'src/core/SkQuadClipper.cpp', + 'src/core/SkQuadClipper.h', + 'src/core/SkQuadTree.cpp', + 'src/core/SkQuadTree.h', + 'src/core/SkQuadTreePicture.cpp', + 'src/core/SkQuadTreePicture.h', + 'src/core/SkRasterClip.cpp', + 'src/core/SkRasterizer.cpp', + 'src/core/SkReadBuffer.cpp', + 'src/core/SkRect.cpp', + 'src/core/SkRefDict.cpp', + 'src/core/SkRegion.cpp', + 'src/core/SkRegionPriv.h', + 'src/core/SkRegion_path.cpp', + 'src/core/SkRRect.cpp', + 'src/core/SkRTree.h', + 'src/core/SkRTree.cpp', + 'src/core/SkScaledImageCache.cpp', + 'src/core/SkScalar.cpp', + 'src/core/SkScalerContext.cpp', + 'src/core/SkScalerContext.h', + 'src/core/SkScan.cpp', + 'src/core/SkScan.h', + 'src/core/SkScanPriv.h', + 'src/core/SkScan_AntiPath.cpp', + 'src/core/SkScan_Antihair.cpp', + 'src/core/SkScan_Hairline.cpp', + 'src/core/SkScan_Path.cpp', + 'src/core/SkShader.cpp', + 'src/core/SkSpriteBlitter_ARGB32.cpp', + 'src/core/SkSpriteBlitter_RGB16.cpp', + 'src/core/SkSinTable.h', + 'src/core/SkSpriteBlitter.h', + 'src/core/SkSpriteBlitterTemplate.h', + 'src/core/SkStream.cpp', + 'src/core/SkString.cpp', + 'src/core/SkStringUtils.cpp', + 'src/core/SkStroke.h', + 'src/core/SkStroke.cpp', + 'src/core/SkStrokeRec.cpp', + 'src/core/SkStrokerPriv.cpp', + 'src/core/SkStrokerPriv.h', + 'src/core/SkTextFormatParams.h', + 'src/core/SkTileGrid.cpp', + 'src/core/SkTileGrid.h', + 'src/core/SkTileGridPicture.cpp', + 'src/core/SkTLList.h', + 'src/core/SkTLS.cpp', + 'src/core/SkTraceEvent.h', + 'src/core/SkTSearch.cpp', + 'src/core/SkTSort.h', + 'src/core/SkTypeface.cpp', + 'src/core/SkTypefaceCache.cpp', + 'src/core/SkTypefaceCache.h', + 'src/core/SkUnPreMultiply.cpp', + 'src/core/SkUtils.cpp', + 'src/core/SkValidatingReadBuffer.cpp', + 'src/core/SkWriteBuffer.cpp', + 'src/core/SkWriter32.cpp', + 'src/core/SkXfermode.cpp', + 'src/doc/SkDocument.cpp', + 'src/image/SkImage.cpp', + 'src/image/SkImagePriv.cpp', + 'src/image/SkImage_Codec.cpp', + 'src/image/SkImage_Picture.cpp', + 'src/image/SkImage_Raster.cpp', + 'src/image/SkSurface.cpp', + 'src/image/SkSurface_Base.h', + 'src/image/SkSurface_Picture.cpp', + 'src/image/SkSurface_Raster.cpp', + 'src/pipe/SkGPipeRead.cpp', + 'src/pipe/SkGPipeWrite.cpp', + 'include/core/SkAdvancedTypefaceMetrics.h', + 'include/core/SkBitmap.h', + 'include/core/SkBitmapDevice.h', + 'include/core/SkBlitRow.h', + 'include/core/SkBounder.h', + 'include/core/SkCanvas.h', + 'include/core/SkChecksum.h', + 'include/core/SkChunkAlloc.h', + 'include/core/SkClipStack.h', + 'include/core/SkColor.h', + 'include/core/SkColorFilter.h', + 'include/core/SkColorPriv.h', + 'include/core/SkColorShader.h', + 'include/core/SkComposeShader.h', + 'include/core/SkData.h', + 'include/core/SkDeque.h', + 'include/core/SkDevice.h', + 'include/core/SkDeviceProperties.h', + 'include/core/SkDither.h', + 'include/core/SkDraw.h', + 'include/core/SkDrawFilter.h', + 'include/core/SkDrawLooper.h', + 'include/core/SkEndian.h', + 'include/core/SkError.h', + 'include/core/SkFixed.h', + 'include/core/SkFlattenable.h', + 'include/core/SkFlattenableSerialization.h', + 'include/core/SkFloatBits.h', + 'include/core/SkFloatingPoint.h', + 'include/core/SkFontHost.h', + 'include/core/SkGeometry.h', + 'include/core/SkGraphics.h', + 'include/core/SkImage.h', + 'include/core/SkImageDecoder.h', + 'include/core/SkImageEncoder.h', + 'include/core/SkImageFilter.h', + 'include/core/SkImageInfo.h', + 'include/core/SkInstCnt.h', + 'include/core/SkMallocPixelRef.h', + 'include/core/SkMask.h', + 'include/core/SkMaskFilter.h', + 'include/core/SkMath.h', + 'include/core/SkMatrix.h', + 'include/core/SkMetaData.h', + 'include/core/SkOnce.h', + 'include/core/SkOSFile.h', + 'include/core/SkPackBits.h', + 'include/core/SkPaint.h', + 'include/core/SkPath.h', + 'include/core/SkPathEffect.h', + 'include/core/SkPathMeasure.h', + 'include/core/SkPathRef.h', + 'include/core/SkPicture.h', + 'include/core/SkPixelRef.h', + 'include/core/SkPoint.h', + 'include/core/SkPreConfig.h', + 'include/core/SkRasterizer.h', + 'include/core/SkReader32.h', + 'include/core/SkRect.h', + 'include/core/SkRefCnt.h', + 'include/core/SkRegion.h', + 'include/core/SkRRect.h', + 'include/core/SkScalar.h', + 'include/core/SkShader.h', + 'include/core/SkStream.h', + 'include/core/SkString.h', + 'include/core/SkStringUtils.h', + 'include/core/SkStrokeRec.h', + 'include/core/SkSurface.h', + 'include/core/SkTArray.h', + 'include/core/SkTDArray.h', + 'include/core/SkTDStack.h', + 'include/core/SkTDict.h', + 'include/core/SkTInternalLList.h', + 'include/core/SkTileGridPicture.h', + 'include/core/SkTRegistry.h', + 'include/core/SkTSearch.h', + 'include/core/SkTemplates.h', + 'include/core/SkThread.h', + 'include/core/SkTime.h', + 'include/core/SkTLazy.h', + 'include/core/SkTypeface.h', + 'include/core/SkTypes.h', + 'include/core/SkUnPreMultiply.h', + 'include/core/SkUnitMapper.h', + 'include/core/SkUtils.h', + 'include/core/SkWeakRefCnt.h', + 'include/core/SkWriter32.h', + 'include/core/SkXfermode.h', + 'src/lazy/SkCachingPixelRef.cpp', + 'src/lazy/SkCachingPixelRef.h', + 'include/pathops/SkPathOps.h', + 'src/pathops/SkAddIntersections.cpp', + 'src/pathops/SkDCubicIntersection.cpp', + 'src/pathops/SkDCubicLineIntersection.cpp', + 'src/pathops/SkDCubicToQuads.cpp', + 'src/pathops/SkDLineIntersection.cpp', + 'src/pathops/SkDQuadImplicit.cpp', + 'src/pathops/SkDQuadIntersection.cpp', + 'src/pathops/SkDQuadLineIntersection.cpp', + 'src/pathops/SkIntersections.cpp', + 'src/pathops/SkOpAngle.cpp', + 'src/pathops/SkOpContour.cpp', + 'src/pathops/SkOpEdgeBuilder.cpp', + 'src/pathops/SkOpSegment.cpp', + 'src/pathops/SkPathOpsBounds.cpp', + 'src/pathops/SkPathOpsCommon.cpp', + 'src/pathops/SkPathOpsCubic.cpp', + 'src/pathops/SkPathOpsDebug.cpp', + 'src/pathops/SkPathOpsLine.cpp', + 'src/pathops/SkPathOpsOp.cpp', + 'src/pathops/SkPathOpsPoint.cpp', + 'src/pathops/SkPathOpsQuad.cpp', + 'src/pathops/SkPathOpsRect.cpp', + 'src/pathops/SkPathOpsSimplify.cpp', + 'src/pathops/SkPathOpsTriangle.cpp', + 'src/pathops/SkPathOpsTypes.cpp', + 'src/pathops/SkPathWriter.cpp', + 'src/pathops/SkQuarticRoot.cpp', + 'src/pathops/SkReduceOrder.cpp', + 'src/pathops/SkAddIntersections.h', + 'src/pathops/SkDQuadImplicit.h', + 'src/pathops/SkIntersectionHelper.h', + 'src/pathops/SkIntersections.h', + 'src/pathops/SkLineParameters.h', + 'src/pathops/SkOpAngle.h', + 'src/pathops/SkOpContour.h', + 'src/pathops/SkOpEdgeBuilder.h', + 'src/pathops/SkOpSegment.h', + 'src/pathops/SkOpSpan.h', + 'src/pathops/SkPathOpsBounds.h', + 'src/pathops/SkPathOpsCommon.h', + 'src/pathops/SkPathOpsCubic.h', + 'src/pathops/SkPathOpsCurve.h', + 'src/pathops/SkPathOpsDebug.h', + 'src/pathops/SkPathOpsLine.h', + 'src/pathops/SkPathOpsPoint.h', + 'src/pathops/SkPathOpsQuad.h', + 'src/pathops/SkPathOpsRect.h', + 'src/pathops/SkPathOpsTriangle.h', + 'src/pathops/SkPathOpsTypes.h', + 'src/pathops/SkPathWriter.h', + 'src/pathops/SkQuarticRoot.h', + 'src/pathops/SkReduceOrder.h', + ], + + 'skia_effects_sources': [ + 'src/effects/Sk1DPathEffect.cpp', + 'src/effects/Sk2DPathEffect.cpp', + 'src/effects/SkArithmeticMode.cpp', + 'src/effects/SkAvoidXfermode.cpp', + 'src/effects/SkBicubicImageFilter.cpp', + 'src/effects/SkBitmapSource.cpp', + 'src/effects/SkBlurDrawLooper.cpp', + 'src/effects/SkBlurMask.cpp', + 'src/effects/SkBlurMask.h', + 'src/effects/SkBlurImageFilter.cpp', + 'src/effects/SkBlurMaskFilter.cpp', + 'src/effects/SkColorFilters.cpp', + 'src/effects/SkColorFilterImageFilter.cpp', + 'src/effects/SkColorMatrix.cpp', + 'src/effects/SkColorMatrixFilter.cpp', + 'src/effects/SkComposeImageFilter.cpp', + 'src/effects/SkCornerPathEffect.cpp', + 'src/effects/SkDashPathEffect.cpp', + 'src/effects/SkDiscretePathEffect.cpp', + 'src/effects/SkDisplacementMapEffect.cpp', + 'src/effects/SkDropShadowImageFilter.cpp', + 'src/effects/SkEmbossMask.cpp', + 'src/effects/SkEmbossMask.h', + 'src/effects/SkEmbossMask_Table.h', + 'src/effects/SkEmbossMaskFilter.cpp', + 'src/effects/SkGpuBlurUtils.h', + 'src/effects/SkGpuBlurUtils.cpp', + 'src/effects/SkKernel33MaskFilter.cpp', + 'src/effects/SkLayerDrawLooper.cpp', + 'src/effects/SkLayerRasterizer.cpp', + 'src/effects/SkLerpXfermode.cpp', + 'src/effects/SkLightingImageFilter.cpp', + 'src/effects/SkLumaColorFilter.cpp', + 'src/effects/SkMagnifierImageFilter.cpp', + 'src/effects/SkMatrixConvolutionImageFilter.cpp', + 'src/effects/SkMatrixImageFilter.cpp', + 'src/effects/SkMergeImageFilter.cpp', + 'src/effects/SkMorphologyImageFilter.cpp', + 'src/effects/SkOffsetImageFilter.cpp', + 'src/effects/SkPaintFlagsDrawFilter.cpp', + 'src/effects/SkPerlinNoiseShader.cpp', + 'src/effects/SkPictureImageFilter.cpp', + 'src/effects/SkPixelXorXfermode.cpp', + 'src/effects/SkPorterDuff.cpp', + 'src/effects/SkRectShaderImageFilter.cpp', + 'src/effects/SkStippleMaskFilter.cpp', + 'src/effects/SkTableColorFilter.cpp', + 'src/effects/SkTableMaskFilter.cpp', + 'src/effects/SkTestImageFilters.cpp', + 'src/effects/SkTileImageFilter.cpp', + 'src/effects/SkTransparentShader.cpp', + 'src/effects/SkXfermodeImageFilter.cpp', + + 'src/effects/gradients/SkBitmapCache.cpp', + 'src/effects/gradients/SkBitmapCache.h', + 'src/effects/gradients/SkClampRange.cpp', + 'src/effects/gradients/SkClampRange.h', + 'src/effects/gradients/SkRadialGradient_Table.h', + 'src/effects/gradients/SkGradientShader.cpp', + 'src/effects/gradients/SkGradientShaderPriv.h', + 'src/effects/gradients/SkLinearGradient.cpp', + 'src/effects/gradients/SkLinearGradient.h', + 'src/effects/gradients/SkRadialGradient.cpp', + 'src/effects/gradients/SkRadialGradient.h', + 'src/effects/gradients/SkTwoPointRadialGradient.cpp', + 'src/effects/gradients/SkTwoPointRadialGradient.h', + 'src/effects/gradients/SkTwoPointConicalGradient.cpp', + 'src/effects/gradients/SkTwoPointConicalGradient.h', + 'src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', + 'src/effects/gradients/SkTwoPointConicalGradient_gpu.h', + 'src/effects/gradients/SkSweepGradient.cpp', + 'src/effects/gradients/SkSweepGradient.h', + + 'include/effects/Sk1DPathEffect.h', + 'include/effects/Sk2DPathEffect.h', + 'include/effects/SkXfermodeImageFilter.h', + 'include/effects/SkArithmeticMode.h', + 'include/effects/SkAvoidXfermode.h', + 'include/effects/SkBitmapSource.h', + 'include/effects/SkBlurDrawLooper.h', + 'include/effects/SkBlurImageFilter.h', + 'include/effects/SkBlurMaskFilter.h', + 'include/effects/SkColorMatrix.h', + 'include/effects/SkColorMatrixFilter.h', + 'include/effects/SkColorFilterImageFilter.h', + 'include/effects/SkCornerPathEffect.h', + 'include/effects/SkDashPathEffect.h', + 'include/effects/SkDiscretePathEffect.h', + 'include/effects/SkDisplacementMapEffect.h', + 'include/effects/SkDrawExtraPathEffect.h', + 'include/effects/SkDropShadowImageFilter.h', + 'include/effects/SkEmbossMaskFilter.h', + 'include/effects/SkGradientShader.h', + 'include/effects/SkKernel33MaskFilter.h', + 'include/effects/SkLayerDrawLooper.h', + 'include/effects/SkLayerRasterizer.h', + 'include/effects/SkLerpXfermode.h', + 'include/effects/SkLightingImageFilter.h', + 'include/effects/SkOffsetImageFilter.h', + 'include/effects/SkMorphologyImageFilter.h', + 'include/effects/SkPaintFlagsDrawFilter.h', + 'include/effects/SkPerlinNoiseShader.h', + 'include/effects/SkPixelXorXfermode.h', + 'include/effects/SkPorterDuff.h', + 'include/effects/SkRectShaderImageFilter.h', + 'include/effects/SkStippleMaskFilter.h', + 'include/effects/SkTableColorFilter.h', + 'include/effects/SkTableMaskFilter.h', + 'include/effects/SkTileImageFilter.h', + 'include/effects/SkTransparentShader.h', + 'include/effects/SkMagnifierImageFilter.h', + ], + + 'skia_pdf_sources': [ + 'include/pdf/SkPDFDevice.h', + 'include/pdf/SkPDFDocument.h', + + 'src/pdf/SkPDFCatalog.cpp', + 'src/pdf/SkPDFCatalog.h', + 'src/pdf/SkPDFDevice.cpp', + 'src/pdf/SkPDFDocument.cpp', + '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/SkPDFImage.cpp', + 'src/pdf/SkPDFImage.h', + 'src/pdf/SkPDFPage.cpp', + 'src/pdf/SkPDFPage.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/pdf/SkTSet.h', + ], + + 'skia_library_sources': [ + 'src/core/SkFlate.cpp', # this should likely be moved into src/utils in skia + + 'include/images/SkImageRef_GlobalPool.h', + 'include/images/SkImageRef.h', + 'include/images/SkMovie.h', + 'include/images/SkPageFlipper.h', + 'include/ports/SkTypeface_win.h', + 'include/utils/mac/SkCGUtils.h', + 'include/utils/SkDeferredCanvas.h', + 'include/utils/SkEventTracer.h', + 'include/utils/SkMatrix44.h', + 'include/utils/SkNullCanvas.h', + 'include/utils/SkNWayCanvas.h', + 'include/utils/SkPictureUtils.h', + 'include/utils/SkProxyCanvas.h', + 'include/utils/SkRTConf.h', + 'src/fonts/SkFontMgr_fontconfig.cpp', + 'src/images/SkScaledBitmapSampler.cpp', + 'src/images/SkScaledBitmapSampler.h', + 'src/ports/SkFontConfigInterface_android.cpp', + 'src/ports/SkFontConfigInterface_direct.cpp', + 'src/ports/SkFontConfigParser_android.cpp', + 'src/ports/SkFontHost_fontconfig.cpp', + 'src/ports/SkFontHost_FreeType_common.cpp', + 'src/ports/SkFontHost_FreeType_common.h', + 'src/ports/SkFontHost_FreeType.cpp', + 'src/ports/SkFontHost_linux.cpp', + 'src/ports/SkFontHost_mac.cpp', + 'src/ports/SkFontHost_win.cpp', + 'src/ports/SkFontHost_win_dw.cpp', + 'src/ports/SkFontMgr_default_gdi.cpp', + 'src/ports/SkGlobalInitialization_chromium.cpp', + 'src/ports/SkImageDecoder_empty.cpp', + 'src/ports/SkOSFile_posix.cpp', + 'src/ports/SkOSFile_stdio.cpp', + 'src/ports/SkOSFile_win.cpp', + 'src/ports/SkThread_win.cpp', + 'src/ports/SkTime_Unix.cpp', + 'src/ports/SkTLS_pthread.cpp', + 'src/ports/SkTLS_win.cpp', + 'src/sfnt/SkOTTable_name.cpp', + 'src/sfnt/SkOTTable_name.h', + 'src/sfnt/SkOTUtils.cpp', + 'src/sfnt/SkOTUtils.h', + 'src/utils/debugger/SkDebugCanvas.cpp', + 'src/utils/debugger/SkDebugCanvas.h', + 'src/utils/debugger/SkDrawCommand.cpp', + 'src/utils/debugger/SkDrawCommand.h', + 'src/utils/debugger/SkObjectParser.cpp', + 'src/utils/debugger/SkObjectParser.h', + 'src/utils/mac/SkCreateCGImageRef.cpp', + 'src/utils/SkBase64.cpp', + 'src/utils/SkBase64.h', + 'src/utils/SkBitmapHasher.cpp', + 'src/utils/SkBitmapHasher.h', + 'src/utils/SkBitSet.cpp', + 'src/utils/SkBitSet.h', + 'src/utils/SkBoundaryPatch.cpp', + 'src/utils/SkFrontBufferedStream.cpp', + 'src/utils/SkCamera.cpp', + 'src/utils/SkCanvasStack.h', + 'src/utils/SkCanvasStack.cpp', + 'src/utils/SkCanvasStateUtils.cpp', + 'src/utils/SkCubicInterval.cpp', + 'src/utils/SkCullPoints.cpp', + 'src/utils/SkDeferredCanvas.cpp', + 'src/utils/SkDumpCanvas.cpp', + 'src/utils/SkEventTracer.cpp', + 'src/utils/SkFloatUtils.h', + 'src/utils/SkGatherPixelRefsAndRects.cpp', + 'src/utils/SkGatherPixelRefsAndRects.h', + 'src/utils/SkInterpolator.cpp', + 'src/utils/SkLayer.cpp', + 'src/utils/SkMatrix44.cpp', + 'src/utils/SkMD5.cpp', + 'src/utils/SkMD5.h', + 'src/utils/SkMeshUtils.cpp', + 'src/utils/SkNinePatch.cpp', + 'src/utils/SkNWayCanvas.cpp', + 'src/utils/SkNullCanvas.cpp', + 'src/utils/SkOSFile.cpp', + 'src/utils/SkParse.cpp', + 'src/utils/SkParseColor.cpp', + 'src/utils/SkParsePath.cpp', + 'src/utils/SkPictureUtils.cpp', + 'src/utils/SkPathUtils.cpp', + 'src/utils/SkProxyCanvas.cpp', + 'src/utils/SkSHA1.cpp', + 'src/utils/SkSHA1.h', + 'src/utils/SkRTConf.cpp', + 'src/utils/SkThreadUtils.h', + 'src/utils/SkThreadUtils_pthread.cpp', + 'src/utils/SkThreadUtils_pthread.h', + 'src/utils/SkThreadUtils_pthread_linux.cpp', + 'src/utils/SkThreadUtils_pthread_mach.cpp', + 'src/utils/SkThreadUtils_pthread_other.cpp', + 'src/utils/SkThreadUtils_win.cpp', + 'src/utils/SkThreadUtils_win.h', + 'src/utils/SkTFitsIn.h', + 'src/utils/SkTLogic.h', + 'src/utils/SkUnitMappers.cpp', + + #mac + 'include/utils/mac/SkCGUtils.h', + 'src/utils/mac/SkCreateCGImageRef.cpp', + + #windows + 'include/utils/win/SkAutoCoInitialize.h', + 'include/utils/win/SkHRESULT.h', + 'include/utils/win/SkIStream.h', + 'include/utils/win/SkTScopedComPtr.h', + 'src/utils/win/SkAutoCoInitialize.cpp', + 'src/utils/win/SkDWrite.h', + 'src/utils/win/SkDWrite.cpp', + 'src/utils/win/SkDWriteFontFileStream.cpp', + 'src/utils/win/SkDWriteFontFileStream.h', + 'src/utils/win/SkDWriteGeometrySink.cpp', + 'src/utils/win/SkDWriteGeometrySink.h', + 'src/utils/win/SkHRESULT.cpp', + 'src/utils/win/SkIStream.cpp', + 'src/utils/win/SkWGL_win.cpp', + + #testing + 'src/fonts/SkGScalerContext.cpp', + 'src/fonts/SkGScalerContext.h', + ], +} diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk index bb06d39f8a..cfba8d911a 100644 --- a/skia/skia_library.target.darwin-arm.mk +++ b/skia/skia_library.target.darwin-arm.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -114,6 +115,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -145,6 +147,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -272,7 +275,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -288,6 +290,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -327,6 +330,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -461,10 +465,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -624,6 +625,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -687,9 +689,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -706,9 +708,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk index 78466dc3e8..e0bbb228df 100644 --- a/skia/skia_library.target.darwin-mips.mk +++ b/skia/skia_library.target.darwin-mips.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -114,6 +115,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -145,6 +147,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -272,7 +275,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -288,6 +290,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -327,6 +330,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -460,10 +464,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -482,6 +484,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -599,10 +602,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -621,6 +622,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -684,9 +686,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -701,9 +703,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk index 6553dfa435..766ed3e33c 100644 --- a/skia/skia_library.target.darwin-x86.mk +++ b/skia/skia_library.target.darwin-x86.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -115,6 +116,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -146,6 +148,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -273,7 +276,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -289,6 +291,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -328,6 +331,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -462,10 +466,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -623,6 +624,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -685,9 +687,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -702,9 +704,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_library.target.darwin-x86_64.mk b/skia/skia_library.target.darwin-x86_64.mk index edd71d1e83..2de04ffd43 100644 --- a/skia/skia_library.target.darwin-x86_64.mk +++ b/skia/skia_library.target.darwin-x86_64.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -115,6 +116,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -146,6 +148,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -273,7 +276,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -289,6 +291,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -328,6 +331,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -462,10 +466,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -623,6 +624,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -685,9 +687,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -702,9 +704,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk index bb06d39f8a..cfba8d911a 100644 --- a/skia/skia_library.target.linux-arm.mk +++ b/skia/skia_library.target.linux-arm.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -114,6 +115,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -145,6 +147,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -272,7 +275,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -288,6 +290,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -327,6 +330,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -461,10 +465,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -624,6 +625,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -687,9 +689,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -706,9 +708,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk index 78466dc3e8..e0bbb228df 100644 --- a/skia/skia_library.target.linux-mips.mk +++ b/skia/skia_library.target.linux-mips.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -114,6 +115,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -145,6 +147,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -272,7 +275,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -288,6 +290,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -327,6 +330,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -460,10 +464,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -482,6 +484,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -599,10 +602,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -621,6 +622,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -684,9 +686,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -701,9 +703,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk index 6553dfa435..766ed3e33c 100644 --- a/skia/skia_library.target.linux-x86.mk +++ b/skia/skia_library.target.linux-x86.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -115,6 +116,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -146,6 +148,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -273,7 +276,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -289,6 +291,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -328,6 +331,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -462,10 +466,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -623,6 +624,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -685,9 +687,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -702,9 +704,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk index edd71d1e83..2de04ffd43 100644 --- a/skia/skia_library.target.linux-x86_64.mk +++ b/skia/skia_library.target.linux-x86_64.mk @@ -6,13 +6,14 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_library_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ - $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp GYP_GENERATED_OUTPUTS := @@ -115,6 +116,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkFlattenableSerialization.cpp \ third_party/skia/src/core/SkFloat.cpp \ third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFont.cpp \ third_party/skia/src/core/SkFontHost.cpp \ third_party/skia/src/core/SkFontDescriptor.cpp \ third_party/skia/src/core/SkFontStream.cpp \ @@ -146,6 +148,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ third_party/skia/src/core/SkPoint.cpp \ @@ -273,7 +276,6 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkPixelXorXfermode.cpp \ third_party/skia/src/effects/SkPorterDuff.cpp \ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ - third_party/skia/src/effects/SkResizeImageFilter.cpp \ third_party/skia/src/effects/SkStippleMaskFilter.cpp \ third_party/skia/src/effects/SkTableColorFilter.cpp \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ @@ -289,6 +291,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ third_party/skia/src/pdf/SkPDFCatalog.cpp \ third_party/skia/src/pdf/SkPDFDevice.cpp \ @@ -328,6 +331,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrGpu.cpp \ third_party/skia/src/gpu/GrGpuFactory.cpp \ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrLayerCache.cpp \ third_party/skia/src/gpu/GrMemoryPool.cpp \ third_party/skia/src/gpu/GrOvalRenderer.cpp \ third_party/skia/src/gpu/GrPaint.cpp \ @@ -462,10 +466,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -484,6 +486,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -601,10 +604,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -623,6 +624,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -685,9 +687,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -702,9 +704,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_opts.target.darwin-arm.mk b/skia/skia_opts.target.darwin-arm.mk index 0e75282715..e0306c4641 100644 --- a/skia/skia_opts.target.darwin-arm.mk +++ b/skia/skia_opts.target.darwin-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -95,10 +96,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -217,10 +216,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -283,9 +280,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -302,9 +299,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_opts.target.darwin-mips.mk b/skia/skia_opts.target.darwin-mips.mk index 09f80dbacb..a049c7b958 100644 --- a/skia/skia_opts.target.darwin-mips.mk +++ b/skia/skia_opts.target.darwin-mips.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -93,10 +94,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -278,9 +275,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -295,9 +292,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_opts.target.darwin-x86.mk b/skia/skia_opts.target.darwin-x86.mk index efcf1a9e1b..1520d53325 100644 --- a/skia/skia_opts.target.darwin-x86.mk +++ b/skia/skia_opts.target.darwin-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -94,10 +95,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -277,9 +274,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -294,9 +291,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_opts.target.darwin-x86_64.mk b/skia/skia_opts.target.darwin-x86_64.mk index e18acf6c0f..2c6832933d 100644 --- a/skia/skia_opts.target.darwin-x86_64.mk +++ b/skia/skia_opts.target.darwin-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -94,10 +95,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -277,9 +274,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -294,9 +291,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_opts.target.linux-arm.mk b/skia/skia_opts.target.linux-arm.mk index 0e75282715..e0306c4641 100644 --- a/skia/skia_opts.target.linux-arm.mk +++ b/skia/skia_opts.target.linux-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -95,10 +96,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -217,10 +216,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -283,9 +280,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ @@ -302,9 +299,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ diff --git a/skia/skia_opts.target.linux-mips.mk b/skia/skia_opts.target.linux-mips.mk index 09f80dbacb..a049c7b958 100644 --- a/skia/skia_opts.target.linux-mips.mk +++ b/skia/skia_opts.target.linux-mips.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -93,10 +94,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -278,9 +275,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -295,9 +292,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ diff --git a/skia/skia_opts.target.linux-x86.mk b/skia/skia_opts.target.linux-x86.mk index efcf1a9e1b..1520d53325 100644 --- a/skia/skia_opts.target.linux-x86.mk +++ b/skia/skia_opts.target.linux-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -94,10 +95,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -277,9 +274,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -294,9 +291,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_opts.target.linux-x86_64.mk b/skia/skia_opts.target.linux-x86_64.mk index e18acf6c0f..2c6832933d 100644 --- a/skia/skia_opts.target.linux-x86_64.mk +++ b/skia/skia_opts.target.linux-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -94,10 +95,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -213,10 +212,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -277,9 +274,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -294,9 +291,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk index bdd506ba78..b40a8016b0 100644 --- a/skia/skia_opts_neon.target.darwin-arm.mk +++ b/skia/skia_opts_neon.target.darwin-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_neon_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -96,10 +97,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -218,10 +217,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -284,9 +281,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -march=armv7-a \ @@ -305,9 +302,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -march=armv7-a \ diff --git a/skia/skia_opts_neon.target.linux-arm.mk b/skia/skia_opts_neon.target.linux-arm.mk index bdd506ba78..b40a8016b0 100644 --- a/skia/skia_opts_neon.target.linux-arm.mk +++ b/skia/skia_opts_neon.target.linux-arm.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_neon_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -96,10 +97,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -218,10 +217,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -284,9 +281,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -march=armv7-a \ @@ -305,9 +302,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -march=armv7-a \ diff --git a/skia/skia_opts_ssse3.target.darwin-x86.mk b/skia/skia_opts_ssse3.target.darwin-x86.mk index 5c7786440d..6493e2d100 100644 --- a/skia/skia_opts_ssse3.target.darwin-x86.mk +++ b/skia/skia_opts_ssse3.target.darwin-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_ssse3_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -88,10 +89,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -207,10 +206,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -270,9 +267,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -287,9 +284,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_opts_ssse3.target.darwin-x86_64.mk b/skia/skia_opts_ssse3.target.darwin-x86_64.mk index 85f2236395..93d57d7736 100644 --- a/skia/skia_opts_ssse3.target.darwin-x86_64.mk +++ b/skia/skia_opts_ssse3.target.darwin-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_ssse3_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -88,10 +89,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -207,10 +206,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -270,9 +267,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -287,9 +284,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ diff --git a/skia/skia_opts_ssse3.target.linux-x86.mk b/skia/skia_opts_ssse3.target.linux-x86.mk index 5c7786440d..6493e2d100 100644 --- a/skia/skia_opts_ssse3.target.linux-x86.mk +++ b/skia/skia_opts_ssse3.target.linux-x86.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_ssse3_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -88,10 +89,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -207,10 +206,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -270,9 +267,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ @@ -287,9 +284,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ diff --git a/skia/skia_opts_ssse3.target.linux-x86_64.mk b/skia/skia_opts_ssse3.target.linux-x86_64.mk index 85f2236395..93d57d7736 100644 --- a/skia/skia_opts_ssse3.target.linux-x86_64.mk +++ b/skia/skia_opts_ssse3.target.linux-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := skia_skia_opts_ssse3_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -88,10 +89,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -207,10 +206,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ - '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ @@ -270,9 +267,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -287,9 +284,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ |