diff options
author | Mike Klein <mtklein@chromium.org> | 2017-02-06 12:26:51 -0500 |
---|---|---|
committer | Mike Klein <mtklein@chromium.org> | 2017-02-06 17:55:35 +0000 |
commit | 160907f8defef112c358cdd5cb9e5e093ca93b09 (patch) | |
tree | 370fd63868b81fbc488b2cc7a672a0b015db92b4 /platform_tools | |
parent | 199fb875c5e63c13233209e89b943c7ac7ab6665 (diff) |
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>
Diffstat (limited to 'platform_tools')
-rw-r--r-- | platform_tools/android/gyp/canvasproof.gypi | 75 | ||||
-rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 93 | ||||
-rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 54 | ||||
-rw-r--r-- | platform_tools/android/gyp/skia_launcher.gypi | 9 | ||||
-rw-r--r-- | platform_tools/android/gyp/viewer.gypi | 65 | ||||
-rwxr-xr-x | platform_tools/ios/bin/ios_ninja | 21 |
6 files changed, 0 insertions, 317 deletions
diff --git a/platform_tools/android/gyp/canvasproof.gypi b/platform_tools/android/gyp/canvasproof.gypi deleted file mode 100644 index f733d0e03a..0000000000 --- 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 55f9576f8a..0000000000 --- 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 87c47147cf..0000000000 --- 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 f9eec20136..0000000000 --- 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 6d2659b2cb..0000000000 --- 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 a0f721aec2..0000000000 --- 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 |