diff --git a/BUILD.gn b/BUILD.gn
index b23277c..419b082 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,10 +6,6 @@
 import("gn/android_framework_defines.gni")
 import("gn/shared_sources.gni")
 
-if (!defined(is_skia_standalone)) {
-  is_skia_standalone = false
-}
-
 declare_args() {
   skia_use_angle = false
   skia_use_expat = true
@@ -29,11 +25,11 @@
   skia_enable_android_framework_defines = false
   skia_enable_discrete_gpu = true
   skia_enable_effects = true
-  skia_enable_jumper = is_skia_standalone
+  skia_enable_jumper = !is_official_build
   skia_enable_gpu = true
   skia_enable_pdf = true
-  skia_enable_tools = is_skia_standalone
-  skia_enable_vulkan_debug_layers = is_skia_standalone && is_debug
+  skia_enable_tools = !is_official_build
+  skia_enable_vulkan_debug_layers = !is_official_build && is_debug
   skia_vulkan_sdk = getenv("VULKAN_SDK")
 }
 declare_args() {
@@ -667,7 +663,7 @@
 
   if (is_android) {
     deps += [ "//third_party/expat" ]
-    if (is_skia_standalone && ndk != "") {
+    if (defined(ndk) && ndk != "") {
       deps += [ "//third_party/cpu-features" ]
     }
     sources += [ "src/ports/SkDebug_android.cpp" ]
@@ -1449,7 +1445,7 @@
     }
   }
 
-  if (is_android && is_skia_standalone && ndk != "") {
+  if (is_android && defined(ndk) && ndk != "") {
     copy("gdbserver") {
       sources = [
         "$ndk/$ndk_gdbserver",