Move VisualBench_APK and SampleApp_APK to "everything" target

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1986433002

Review-Url: https://codereview.chromium.org/1986433002

diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index 299aad5..d0c933c 100644 (file)
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -29,6 +29,18 @@
             #'v8.gyp:SkV8Example',
           ],
         }],
+        ['skia_os == "android"', {
+          'dependencies': [
+            'android_system.gyp:SampleApp_APK',
+          ],
+          'conditions': [
+            [ 'skia_gpu == 1', {
+              'dependencies': [
+                'android_system.gyp:VisualBench_APK',
+              ],
+            }],
+          ],
+        }],
       ],
     },
   ],

diff --git a/gyp/most.gyp b/gyp/most.gyp
index 6d56f88..9e54732 100644 (file)
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -49,21 +49,9 @@
             'example.gyp:HelloWorld',
           ],
         }],
-        ['skia_os == "android"', {
+        ['skia_os == "android" and skia_vulkan == 1', {
           'dependencies': [
-            'android_system.gyp:SampleApp_APK',
-          ],
-          'conditions': [
-            [ 'skia_gpu == 1', {
-              'dependencies': [
-                'android_system.gyp:VisualBench_APK',
-              ],
-            }],
-            [ 'skia_vulkan == 1', {
-              'dependencies': [
-                'android_system.gyp:Viewer_APK',
-              ],
-            }],
+            'android_system.gyp:Viewer_APK',
           ],
         }],
         ['skia_os == "ios"', {