Clean up more references to GYP.
Delete files only used by GYP, and files that used GYP. Neither can
possibly be actively used. Beyond that, just a couple doc tweaks.
Change-Id: I0220d7226e7bb9ed7c54a7d8f2906a718313c521
Reviewed-on: https://skia-review.googlesource.com/8062
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
diff --git a/.gitignore b/.gitignore
index 46a48b7..b75dfff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@
TAGS
bower_components
common
-gyp/build
infra/bots/tools/luci-go/linux64/cipd
infra/bots/tools/luci-go/linux64/isolate
infra/bots/tools/luci-go/mac64/cipd
diff --git a/DEPS b/DEPS
index f42e7d4..ac13202 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,6 @@
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@57f17473791703ac82add77c3d77d13d8e2dfbc4",
"third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@08fd250e1af0aa16d18012d39462e6ca9bbc6e90",
- "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56",
"third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.2-rc2",
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index ed33c50..0d58f7f 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -207,8 +207,6 @@
"""Presubmit checks common to upload and commit."""
results = []
sources = lambda x: (x.LocalPath().endswith('.h') or
- x.LocalPath().endswith('.gypi') or
- x.LocalPath().endswith('.gyp') or
x.LocalPath().endswith('.py') or
x.LocalPath().endswith('.sh') or
x.LocalPath().endswith('.m') or
diff --git a/bin/ac b/bin/ac
deleted file mode 100755
index 30e9534..0000000
--- a/bin/ac
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-BRANCH=$(git branch | grep \* | cut -d" " -f 2)
-CLEAN=${CLEAN-clean}
-SAMPLES=100
-
-if [ "$BRANCH" = "$CLEAN" ]; then
- echo "Comparing $BRANCH to itself."
- exit 1
-fi
-
-if [ ! -f $CLEAN.log ]; then
- git checkout $CLEAN
- ./gyp_skia >/dev/null
- platform_tools/android/bin/android_ninja -t Release nanobench
- platform_tools/android/bin/android_run_skia -t Release nanobench $@ --skps /data/local/tmp/skps -i /data/local/tmp/resources --samples $SAMPLES -v > $CLEAN.log
-fi
-
-git checkout $BRANCH
-./gyp_skia >/dev/null
-platform_tools/android/bin/android_ninja -t Release nanobench
-platform_tools/android/bin/android_run_skia -t Release nanobench $@ --skps /data/local/tmp/skps -i /data/local/tmp/resources --samples $SAMPLES -v > $BRANCH.log
-
-./bin/compare $CLEAN.log $BRANCH.log
diff --git a/bin/c b/bin/c
deleted file mode 100755
index fca46d4..0000000
--- a/bin/c
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-BRANCH=$(git branch | grep \* | cut -d" " -f 2)
-CLEAN=${CLEAN-clean}
-SAMPLES=100
-
-if [ "$BRANCH" = "$CLEAN" ]; then
- echo "Comparing $BRANCH to itself."
- exit 1
-fi
-
-if [ ! -f $CLEAN.log ]; then
- git checkout $CLEAN
- python gyp_skia >/dev/null
- ninja -C out/Release nanobench
- out/Release/nanobench $@ --samples $SAMPLES -v 2> $CLEAN.log
-fi
-
-git checkout $BRANCH
-python gyp_skia >/dev/null
-ninja -C out/Release nanobench
-out/Release/nanobench $@ --samples $SAMPLES -v 2> $BRANCH.log
-
-python bin/compare $CLEAN.log $BRANCH.log
diff --git a/infra/bots/recipe_modules/compile/api.py b/infra/bots/recipe_modules/compile/api.py
index 5f332c5..a74131f 100644
--- a/infra/bots/recipe_modules/compile/api.py
+++ b/infra/bots/recipe_modules/compile/api.py
@@ -30,29 +30,11 @@
return env
-def get_gyp_defines(builder_dict):
- gyp_defs = {}
-
- if (builder_dict.get('os') == 'iOS' or
- builder_dict.get('extra_config') == 'iOS'):
- gyp_defs['skia_arch_type'] = 'arm'
- gyp_defs['skia_clang_build'] = '1'
- gyp_defs['skia_os'] = 'ios'
- gyp_defs['skia_warnings_as_errors'] = 1
-
- return gyp_defs
-
-
class CompileApi(recipe_api.RecipeApi):
def run(self):
self.m.core.setup()
env = get_extra_env_vars(self.m.vars.builder_cfg)
- gyp_defs = get_gyp_defines(self.m.vars.builder_cfg)
- gyp_defs_list = ['%s=%s' % (k, v) for k, v in gyp_defs.iteritems()]
- gyp_defs_list.sort()
- env['GYP_DEFINES'] = ' '.join(gyp_defs_list)
-
build_targets = build_targets_from_builder_dict(self.m.vars.builder_cfg)
try:
diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
index 4a7f825..fc2ef63 100644
--- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
+++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
@@ -96,7 +96,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@@ -129,7 +128,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@@ -147,7 +145,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json
index fd79898..b2ef534 100644
--- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json
+++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json
@@ -96,7 +96,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
},
@@ -129,7 +128,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
},
@@ -147,7 +145,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths"
},
diff --git a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json
index 5a33bc5..421be27 100644
--- a/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json
+++ b/infra/bots/recipe_modules/compile/example.expected/pdfium_trybot.json
@@ -100,7 +100,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@@ -133,7 +132,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@@ -151,7 +149,6 @@
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
- "GYP_DEFINES": "",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
diff --git a/platform_tools/android/gyp/canvasproof.gypi b/platform_tools/android/gyp/canvasproof.gypi
deleted file mode 100644
index f733d0e..0000000
--- a/platform_tools/android/gyp/canvasproof.gypi
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'targets': [
- {
- 'target_name': 'canvasproof',
- 'type': 'shared_library',
- 'dependencies': [ 'skia_lib.gyp:skia_lib', ],
- 'sources': [
- '../apps/canvasproof/src/main/jni/JavaInputStream.cpp',
- '../apps/canvasproof/src/main/jni/JavaInputStream.h',
- '../apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.cpp',
- '../apps/canvasproof/src/main/jni/org_skia_canvasproof_GaneshPictureRenderer.h',
- '../apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.cpp',
- '../apps/canvasproof/src/main/jni/org_skia_canvasproof_CreateSkiaPicture.h ',
- ],
- },
- {
- 'target_name': 'CopyCanvasProofDeps',
- 'type': 'none',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'canvasproof',
- ],
- 'copies': [
- {
- 'destination': '../apps/canvasproof/src/main/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libskia_android.so',
- '<(SHARED_LIB_DIR)/libcanvasproof.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libcanvasproof.so',
- ]}
- ],
- ],
- },
- ],
- },
- {
- 'target_name': 'CanvasProof_APK',
- 'type': 'none',
- 'dependencies': [ 'CopyCanvasProofDeps', ],
- 'actions': [
- {
- 'action_name': 'SkiaCanvasProof_apk',
- 'inputs': [
- '../apps/canvasproof/src/main/assets/skps',
- '../apps/canvasproof/src/main/AndroidManifest.xml',
- '../apps/canvasproof/src/main/java/org/skia/canvasproof/CreateSkiaPicture.java',
- '../apps/canvasproof/src/main/java/org/skia/canvasproof/CanvasProofActivity.java',
- '../apps/canvasproof/src/main/java/org/skia/canvasproof/GaneshPictureRenderer.java',
- '../apps/canvasproof/src/main/java/org/skia/canvasproof/HwuiPictureView.java',
- '<(android_base)/apps/canvasproof/src/main/libs/<(android_arch)/libcanvasproof.so',
- '<(android_base)/apps/canvasproof/src/main/libs/<(android_arch)/libskia_android.so',
-
- ],
- 'outputs': [
- '../apps/canvasproof/build',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':canvasproof:assemble<(android_variant)Debug',
- '-p<(android_base)/apps/canvasproof',
- '-PsuppressNativeBuild',
- ],
- },
- ],
- },
- ],
-}
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
deleted file mode 100644
index 55f9576..0000000
--- a/platform_tools/android/gyp/dependencies.gypi
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This GYP file stores the dependencies necessary to build Skia on the Android
-# platform. The OS doesn't provide many stable libraries as part of the
-# distribution so we have to build a few of them ourselves.
-#
-# NOTE: We tried adding the gyp file to the android/ directory at the root of
-# the Skia repo, but that resulted in the generated makefiles being created
-# outside of the out directory. We may be able to move the bulk of this gyp
-# to the /android directory and put a simple shim here, but that has yet to be
-# tested.
-
-{
- 'variables': {
- 'skia_warnings_as_errors': 0,
- },
- 'targets': [
- {
- 'target_name': 'native_app_glue',
- 'type': 'static_library',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/native_app_glue',
- ],
- },
- 'sources': [
- '../third_party/native_app_glue/android_native_app_glue.c',
- '../third_party/native_app_glue/android_native_app_glue.h',
- ],
- 'cflags': [
- '-w',
- ],
- },
- {
- 'target_name': 'cpu_features',
- 'type': 'static_library',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/cpufeatures',
- ],
- },
- 'sources': [
- '../third_party/cpufeatures/cpu-features.c',
- '../third_party/cpufeatures/cpu-features.h',
- ],
- 'cflags': [
- '-w',
- ],
- },
- {
- 'target_name': 'ashmem',
- 'type': 'static_library',
- 'sources': [
- '../third_party/ashmem/cutils/ashmem.h',
- '../third_party/ashmem/cutils/ashmem-dev.c'
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/ashmem',
- ]
- },
- },
- {
- # This target is a dependency for all console-type Skia applications which
- # will run on Android. Since Android requires us to load native code in
- # shared libraries, we need a common entry point to wrap around main().
- # Here we also change the type of all would-be executables to be shared
- # libraries. The alternative would be to introduce a condition in every
- # executable target which changes to a shared library if the target OS is
- # Android. This is nicer because the switch is in one place.
- 'target_name': 'Android_EntryPoint',
- 'type': 'static_library',
- 'direct_dependent_settings': {
- 'target_conditions': [
- # '_type' is an 'automatic variable' which is defined for any
- # target which defines a key-value pair with 'type' as the key (so,
- # all of them). Conditionals inside 'target_conditions' are evaluated
- # *after* all other definitions and conditionals are evaluated, so
- # we're guaranteed that '_type' will be defined when we get here.
- # For more info, see:
- # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
- # - http://codereview.appspot.com/6353065/
- ['_type == "executable"', {
- 'type': 'shared_library',
- }],
- ],
- },
- },
- ]
-}
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
deleted file mode 100644
index 87c4714..0000000
--- a/platform_tools/android/gyp/skia_android.gypi
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This GYP file stores the dependencies necessary to build Skia on the Android
-# platform. The OS doesn't provide many stable libraries as part of the
-# distribution so we have to build a few of them ourselves.
-#
-{
- 'variables': {
- 'conditions': [
- [ 'skia_arch_type == "arm" and arm_version != 7', {
- 'android_arch%': "armeabi",
- 'android_variant%': "arm",
- }],
- [ 'skia_arch_type == "arm" and arm_version == 7', {
- 'android_arch%': "armeabi-v7a",
- 'android_variant%': "arm",
- }],
- [ 'skia_arch_type == "arm64"', {
- 'android_arch%': "arm64-v8a",
- 'android_variant%': "arm64",
- }],
- [ 'skia_arch_type == "x86"', {
- 'android_arch%': "x86",
- 'android_variant%': "x86",
- }],
- [ 'skia_arch_type == "x86_64"', {
- 'android_arch%': "x86_64",
- 'android_variant%': "x86_64",
- }],
- [ 'skia_arch_type == "mips32"', {
- 'android_arch%': "mips",
- 'android_variant%': "mips",
- }],
- [ 'skia_arch_type == "mips64"', {
- 'android_arch%': "mips64",
- 'android_variant%': "mips64",
- }],
- [ 'android_buildtype == "Debug"', {
- 'android_apk_suffix': "debug.apk",
- }, {
- # This also accounts for Release_Developer BUILDTYPE
- 'android_buildtype': "Release",
- 'android_apk_suffix': "release.apk",
- }],
- ],
- },
- 'includes' : [
- 'canvasproof.gypi',
- 'viewer.gypi',
- ],
-}
diff --git a/platform_tools/android/gyp/skia_launcher.gypi b/platform_tools/android/gyp/skia_launcher.gypi
deleted file mode 100644
index f9eec20..0000000
--- a/platform_tools/android/gyp/skia_launcher.gypi
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- 'targets': [{
- 'target_name': 'skia_launcher',
- 'type': 'executable',
- 'cflags': [ '-fPIE' ],
- 'ldflags': [ '-pie' ],
- 'sources': [ '../launcher/skia_launcher.cpp' ],
- }]
-}
diff --git a/platform_tools/android/gyp/viewer.gypi b/platform_tools/android/gyp/viewer.gypi
deleted file mode 100644
index 6d2659b..0000000
--- a/platform_tools/android/gyp/viewer.gypi
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'targets': [
- {
- 'target_name': 'CopyViewerDeps',
- 'type': 'none',
- 'dependencies': [
- 'skia_lib.gyp:skia_lib',
- 'viewer.gyp:viewer',
- ],
- 'copies': [
- {
- 'destination': '<(android_base)/apps/viewer/src/main/libs/<(android_arch)',
- 'conditions': [
- [ 'skia_shared_lib', {
- 'files': [
- '<(SHARED_LIB_DIR)/libskia_android.so',
- '<(SHARED_LIB_DIR)/libviewer.so',
- ]}, {
- 'files': [
- '<(SHARED_LIB_DIR)/libviewer.so',
- ]}
- ],
- ],
- },
- ],
- },
- {
- 'target_name': 'Viewer_APK',
- 'type': 'none',
- 'dependencies': [ 'CopyViewerDeps', ],
- 'actions': [
- {
- 'action_name': 'SkiaViewer_apk',
- 'inputs': [
- '<(android_base)/apps/viewer/src/main/AndroidManifest.xml',
- '<(android_base)/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java',
- '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libviewer.so',
-
- ],
- 'conditions': [
- [ 'skia_shared_lib', {
- 'inputs': [
- '<(android_base)/apps/viewer/src/main/libs/<(android_arch)/libskia_android.so',
- ],
- }],
- ],
- 'outputs': [
- '../apps/viewer/build/outputs/apk/',
- ],
- 'action': [
- '<(android_base)/apps/gradlew',
- ':viewer:assemble<(android_variant)<(android_buildtype)',
- '-p<(android_base)/apps/viewer',
- '-PsuppressNativeBuild',
- '--daemon',
- ],
- },
- ],
- },
- ],
-}
diff --git a/platform_tools/ios/bin/ios_ninja b/platform_tools/ios/bin/ios_ninja
deleted file mode 100755
index a0f721a..0000000
--- a/platform_tools/ios/bin/ios_ninja
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-###############################################################################
-#
-# Build the skia for ios. This assumes that GYP_DEFINES has been set.
-#
-set -x -e
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $SCRIPT_DIR/ios_setup.sh
-
-pushd ${SKIA_SRC_DIR}
-"${SKIA_SRC_DIR}/gyp_skia"
-xcodebuild -project "$SKIA_OUT/gyp/iOSShell.xcodeproj" -configuration "$BUILDTYPE"
-popd
-ios_package_app
diff --git a/site/user/build.md b/site/user/build.md
index 7828897..97add23 100644
--- a/site/user/build.md
+++ b/site/user/build.md
@@ -7,10 +7,6 @@
Skia uses [GN](https://chromium.googlesource.com/chromium/src/tools/gn/) to
configure its builds.
-A few build configurations remain unported to GN, so you may see some `.gyp`
-files laying around left over from when we used GYP. Don't bother looking at
-them.
-
Quickstart
----------
diff --git a/src/ports/SkDebug_android.cpp b/src/ports/SkDebug_android.cpp
index 0a1b59a..6821834 100644
--- a/src/ports/SkDebug_android.cpp
+++ b/src/ports/SkDebug_android.cpp
@@ -14,8 +14,7 @@
#include <android/log.h>
// Print debug output to stdout as well. This is useful for command line
-// applications (e.g. skia_launcher). To enable, include android_output as a
-// gyp dependency.
+// applications (e.g. skia_launcher).
bool gSkDebugToStdOut = false;
void SkDebugf(const char format[], ...) {
diff --git a/tools/generate_includes_cpp.py b/tools/generate_includes_cpp.py
deleted file mode 100644
index abea137..0000000
--- a/tools/generate_includes_cpp.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/python
-
-'''
-Copyright 2014 Google Inc.
-
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
-'''
-
-import os
-import optparse
-import posixpath
-import re
-
-
-def is_ignored(full_path, ignore_list):
- for ignore_path in ignore_list:
- if re.search(ignore_path, full_path, re.I):
- return True
- return False
-
-
-def find_header_files(include_dirs, ignore_list):
- """Return a list of all '.h' files in top_dir.
-
- Args:
- include_dirs: Paths to the directories within which to recursively search
- for files ending in '.h'
- ignore_list: Paths to both files and directories that are to be excluded
- from the search for headers
-
- Returns:
- A list of all the files inside include_dirs that end in '.h', relative to
- their respective include_dir that are not explicitly ignored.
- """
- headers = []
- for top_dir in include_dirs:
- for filename in os.listdir(top_dir):
- full_path = posixpath.join(top_dir, filename)
- if is_ignored(full_path, ignore_list):
- continue
- elif os.path.isdir(full_path):
- nested_headers = find_header_files([full_path], ignore_list)
- for nested_header in nested_headers:
- headers.append(os.path.join(filename, nested_header))
- elif filename.endswith('.h'):
- headers.append(filename)
- return headers
-
-
-def GenerateIncludeCPP(output_file, include_dirs, ignore_list):
- headers = find_header_files(include_dirs, ignore_list)
-
- # Emit resulting source file.
- with open(os.path.join(os.getcwd(), output_file), "w+") as output:
- for header in headers:
- output.write("#include <%s>\n" % header)
-
-
-def main():
- parser = optparse.OptionParser()
- parser.add_option("--ignore", action="store", type="string", dest="ignore",
- help="file to write the processed sources array to.")
- parser.set_usage("""generate_include_cpp out.cpp include_dir
- out.cpp: C++ code to be generated.
- include_dirs: directories to traverse for include files""")
- (options, args) = parser.parse_args()
-
- # The MSVS gyp generator uses windows path separators so we intercept those
- # strings and normalize them to our expected posix representation
- include_dirs = []
- for include_dir in args[1:]:
- include_dirs.append(include_dir.replace("\\", "/"))
- ignore_list = options.ignore.replace("\\", "/")
-
- # We can strip off the relative portion of the path to ensure that when we
- # compare for regex matches we don't fail based on relative path depth
- ignore_list = ignore_list.replace("../", "")
-
- GenerateIncludeCPP(args[0], include_dirs, ignore_list.split())
-
-
-if __name__ == "__main__":
- main()
diff --git a/tools/git-skia-verify b/tools/git-skia-verify
deleted file mode 100644
index c9a6c9d..0000000
--- a/tools/git-skia-verify
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2012 Intel Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# This script builds and runs GM in current workspace with another Skia
-# revision user specifies, and then compares their results. This script is
-# useful when developers want to know whether their changes would cause any
-# regression.
-#
-# As the name of this script tells, it only works for git repository. :)
-#
-# Usage:
-# Put this script into where your PATH can find it.
-# And then invoke:
-# $ git skia-verify [sha1-to-compare-default-is-HEAD^]
-# It would delete {before,after,diff} directory under the current directory,
-# so be warned!
-# After it's done, check out diff/index.html for the possible differences.
-
-
-function say() {
- # set color to yellow
- tput setaf 3
- echo $1
- tput sgr0
-}
-
-function warn() {
- # set color to red
- tput setaf 1
- echo $1
- tput sgr0
-}
-
-REVISION="HEAD^"
-
-if [[ $# -eq 1 ]];
-then
- REVISION="$1"
-fi
-
-tput clear
-
-say "Checking sanity..."
-git diff --exit-code > /dev/null
-if [[ $? -ne 0 ]];
-then
- warn "You have uncommitted changes!"
- exit 1
-fi
-git diff --cached --exit-code > /dev/null
-if [[ $? -ne 0 ]];
-then
- warn "You have uncommitted changes!"
- exit 1
-fi
-
-say "Preparing Directories..."
-rm -rf {before,after,diff}
-mkdir {before,after,diff}
-
-PREVIOUS_BRANCH=`git branch --no-color | grep "^*" | awk '{ print $2}'`
-
-say "Running GM for current revision..."
-./gyp_skia
-make BUILDTYPE=Release -j10
-if [[ $? -ne 0 ]];
-then
- warn "Failed to compile!"
- exit 1
-fi
-./out/Release/gm -w after
-
-say "Running GM for revision $REVISION..."
-# we run the test in a detached branch
-git checkout --detach "$REVISION"
-./gyp_skia
-make BUILDTYPE=Release -j10
-if [[ $? -ne 0 ]];
-then
- warn "Failed to compile!"
- say "Back to original revision..."
- git checkout "$PREVIOUS_BRANCH"
- exit 1
-fi
-./out/Release/gm -w before
-
-say "Back to original revision..."
-git checkout "$PREVIOUS_BRANCH"
-
-say "Comparing..."
-./out/Release/skdiff before after diff
diff --git a/tools/sanitize_source_files.py b/tools/sanitize_source_files.py
index 9fd6d32..1f343b4 100755
--- a/tools/sanitize_source_files.py
+++ b/tools/sanitize_source_files.py
@@ -11,7 +11,7 @@
import sys
-_FILE_EXTENSIONS_TO_SANITIZE = ['cpp', 'h', 'c', 'gyp', 'gypi']
+_FILE_EXTENSIONS_TO_SANITIZE = ['cpp', 'h', 'c']
_SUBDIRS_TO_IGNORE = ['.git', '.svn', 'third_party']