From 97a0918715b621183647d96dbe8fd2eb038ed564 Mon Sep 17 00:00:00 2001
From: liyuqian <liyuqian@google.com>
Date: Wed, 6 Jul 2016 07:52:08 -0700
Subject: Try fix the mac build bot after removing Android SampleApp

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2117793002

Review-Url: https://codereview.chromium.org/2117793002
---
 platform_tools/android/gyp/dependencies.gypi | 32 -------------
 platform_tools/android/gyp/skia_android.gypi | 68 ----------------------------
 2 files changed, 100 deletions(-)

(limited to 'platform_tools/android/gyp')

diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 14f73bf1ab..55f9576f8a 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -89,37 +89,5 @@
         ],
       },
     },
-    {
-      # This target is a dependency for Skia Sample application which runs 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_SampleApp',
-      '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',
-          }],
-        ],
-        'cflags': [
-          '-Wno-unused-private-field',
-        ],
-        'sources': [
-          '../apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp',
-        ],
-      },
-    },
   ]
 }
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index fe535b390a..87c47147cf 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -51,72 +51,4 @@
       'canvasproof.gypi',
       'viewer.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'CopySampleAppDeps',
-      'type': 'none',
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-        'SampleApp.gyp:SampleApp',
-      ],
-      'copies': [
-        # Copy all shared libraries into the Android app's libs folder.  Note
-        # that this copy requires us to build SkiaAndroidApp after those
-        # libraries, so that they exist by the time it occurs.  If there are no
-        # libraries to copy, this will cause an error in Make, but the app will
-        # still build.
-        {
-          'destination': '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)',
-          'conditions': [
-            [ 'skia_shared_lib', {
-              'files': [
-                '<(SHARED_LIB_DIR)/libSampleApp.so',
-                '<(SHARED_LIB_DIR)/libskia_android.so',
-              ]}, {
-              'files': [
-                '<(SHARED_LIB_DIR)/libSampleApp.so',
-             ]}
-           ],
-          ],
-        },
-      ],
-    },
-    {
-      'target_name': 'SampleApp_APK',
-      'type': 'none',
-      'dependencies': [
-        'CopySampleAppDeps',
-      ],
-      'actions': [
-        {
-          'action_name': 'SampleApp_apk',
-          'inputs': [
-            '<(android_base)/apps/sample_app/src/main/AndroidManifest.xml',
-            '<(android_base)/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.h',
-            '<(android_base)/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp',
-            '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleActivity.java',
-            '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleRenderer.java',
-            '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleView.java',
-            '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libSampleApp.so',
-          ],
-          'conditions': [
-            [ 'skia_shared_lib', {
-              'inputs': [
-                '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libskia_android.so',
-              ],
-            }],
-          ],
-          'outputs': [
-            '<(android_base)/apps/sample_app/build/outputs/apk/sample_app-<(android_variant)-<(android_apk_suffix)',
-          ],
-          'action': [
-            '<(android_base)/apps/gradlew',
-            ':sample_app:assemble<(android_variant)<(android_buildtype)',
-            '-p<(android_base)/apps/sample_app',
-            '-PsuppressNativeBuild',
-          ],
-        },
-      ],
-    },
-  ],
 }
-- 
cgit v1.2.3