Remove angle_standalone from GYP files

build/common_defines.gypi

@@ -8,8 +8,6 @@
         'component%': 'static_library',
         'use_libpci%': 1,
         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/10',
-        # build/gyp_angle sets this to 1.
-        'angle_standalone%': '0',
 
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
@@ -34,6 +32,10 @@
         # root of the OSX SDK for Chromium builds, the system root for standalone builds
         'SDKROOT%': "",
     },
+    'defines':
+    [
+        'ANGLE_STANDALONE_BUILD',
+    ],
     'msvs_disabled_warnings':
     [
         4100, # Unreferenced formal parameter. Not interesting.
@@ -64,13 +66,6 @@
                 '<(windows_sdk_path)/Include/um',
             ],
         }],
-        ['angle_standalone==1',
-        {
-            'defines':
-            [
-                'ANGLE_STANDALONE_BUILD',
-            ],
-        }],
     ],
     'msvs_settings':
     {

build/gyp_angle

@@ -28,9 +28,6 @@ def appendCommonArgs(args):
     # Add common.gypi to the include path.
     args.append('-I' + os.path.join(script_dir, 'common.gypi'))
     args.append('--no-parallel')
-    # Indicate ANGLE is being built standalone (as opposed to within
-    # a Chromium workspace).
-    args.append('-Dangle_standalone=1')
 
 def generateProjects(generate_args):
     args = generate_args

src/libEGL.gypi

@@ -5,10 +5,6 @@
 {
     # Everything below this is duplicated in the GN build. If you change
     # anything also change angle/BUILD.gn
-    'variables':
-    {
-        'angle_standalone%': 0,
-    },
     'targets':
     [
         {

src/libGLESv2.gypi

@@ -5,8 +5,6 @@
 {
     'variables':
     {
-        'angle_standalone%': 0,
-
         # These file lists are shared with the GN build.
         'libangle_common_sources':
         [

src/tests/deqp.gypi

@@ -11,12 +11,10 @@
         'variables':
         {
             'angle_build_winrt%': 0,
-            'angle_standalone%': 0,
         },
 
         # Copy conditionally-set variables to the outer variables dict.
         'angle_build_winrt%': '<(angle_build_winrt)',
-        'angle_standalone%': '<(angle_standalone)',
 
         'deqp_path': '<(DEPTH)/third_party/deqp/src',
         'libpng_path': '<(DEPTH)/third_party/libpng',
@@ -1192,7 +1190,7 @@
                 # GoogleTest doesn't support WinRT
                 'angle_build_deqp_gtest_support%': 1,
             }],
-            ['((OS=="win" or OS=="linux" or OS=="mac") and angle_standalone==1 and angle_build_winrt==0)',
+            ['((OS=="win" or OS=="linux" or OS=="mac") and angle_build_winrt==0)',
             {
                 # Build the dEQP executables for all standalone Windows/Linux builds except WinRT
                 # GYP doesn't support generating standalone WinRT executables
@@ -1245,7 +1243,7 @@
     },
     'conditions':
     [
-        ['angle_build_deqp_libraries==1 and angle_standalone==1',
+        ['angle_build_deqp_libraries==1',
         {
             'targets':
             [
@@ -1368,7 +1366,7 @@
                     ],
                 },
             ], # targets
-        }], # angle_build_deqp_libraries==1 and angle_standalone==1
+        }], # angle_build_deqp_libraries==1
         ['angle_build_deqp_libraries==1',
         {
             'targets':
@@ -1518,6 +1516,7 @@
                     [
                         'angle_deqp_decpp',
                         'angle_deqp_support',
+                        'angle_libpng',
                         '<(angle_path)/src/angle.gyp:libEGL',
                         '<(angle_path)/util/util.gyp:angle_util',
                     ],
@@ -1557,13 +1556,6 @@
                     ],
                     'conditions':
                     [
-                        ['angle_standalone==1',
-                        {
-                            'dependencies': [ 'angle_libpng' ],
-                        },
-                        { # angle_standalone!=1
-                            'dependencies': [ '<(DEPTH)/third_party/libpng/libpng.gyp:libpng' ],
-                        }],
                         ['OS=="mac"',
                         {
                             'direct_dependent_settings':

src/tests/tests.gyp

@@ -51,26 +51,15 @@
                 {
                     'target_name': 'angle_test_support',
                     'type': 'none',
-                    'conditions':
+                    'dependencies':
                     [
-                        ['angle_standalone==1',
-                        {
-                            'dependencies': [
-                                'angle_internal_gmock',
-                                'angle_internal_gtest',
-                            ],
-                        },
-                        {
-                            'dependencies': [
-                                '<(DEPTH)/testing/gmock.gyp:gmock',
-                                '<(DEPTH)/testing/gtest.gyp:gtest',
-                            ],
-                        }],
+                        'angle_internal_gmock',
+                        'angle_internal_gtest',
                     ],
                 },
             ],
         }],
-        ['angle_standalone==1 and angle_build_winrt==0',
+        ['angle_build_winrt==0',
         {
             'targets':
             [