Revert "Reland "Add defines to skqp build""

This reverts commit 2ceed56.

Reason for revert: Still breaking android

Original change's description:
> Reland "Add defines to skqp build"
>
> Change-Id: Ic038e6e3279eda7994cf29d886bee0d4d2e69e0b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/511802
> Reviewed-by: Leon Scroggins <[email protected]>
> Commit-Queue: Nathaniel Nifong <[email protected]>

Change-Id: Ic93e9e9cedac2fd7313681f44ba4e87ff1b91241
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512156
Bot-Commit: Rubber Stamper <[email protected]>
Commit-Queue: Leon Scroggins <[email protected]>

gn/gn_to_bp.py

@@ -656,10 +656,6 @@ def strip_headers(sources):
 gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'defines',
                                    skqp_defines, None)
 
-skqp_defines.add("SK_ENABLE_DUMP_GPU")
-skqp_defines.add("SK_BUILD_FOR_SKQP")
-skqp_defines.add("SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1")
-
 skqp_srcs = strip_headers(skqp_srcs)
 skqp_cflags = gn_to_bp_utils.CleanupCFlags(skqp_cflags)
 skqp_cflags_cc = gn_to_bp_utils.CleanupCCFlags(skqp_cflags_cc)

gn/skqp_gn_args.py

@@ -6,6 +6,7 @@ def GetGNArgs(api_level, debug, arch=None, ndk=None, is_android_bp=False):
     gn_args = {
         'ndk_api':                          api_level,
         'is_debug':                         'true' if debug else 'false',
+        'extra_cflags':                     '[ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]',
         'skia_enable_fontmgr_android':      'false',
         'skia_enable_fontmgr_empty':        'true',
         'skia_enable_pdf':                  'false',