diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 1e36d240f8f..e1bbe7d6f83 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -13,6 +13,7 @@
 # or ":copy_libraries" may delete/overwrite your addition, and the build will
 # fail.
 
+import("../build/config/gclient_args.gni")
 import("../build/dart/copy_tree.gni")
 import("../build/executable_suffix.gni")
 import("../sdk_args.gni")
@@ -310,7 +311,8 @@ copy_tree("copy_prebuilt_devtools") {
 
 # This action compiles the devtools app from sources.
 action("build_devtools") {
-  output = "$root_out_dir/$dart_sdk_output/web/devtools_app"
+  visibility = [ ":create_common_sdk" ]
+  output = "$root_out_dir/$dart_sdk_output/bin/resources/devtools"
   outputs = [ output ]
   script = "../tools/build_devtools.py"
   args = [
@@ -897,7 +899,6 @@ group("create_common_sdk") {
     ":copy_headers",
     ":copy_libraries_specification",
     ":copy_license",
-    ":copy_prebuilt_devtools",
     ":copy_readme",
     ":copy_sdk_packages_yaml",
     ":copy_vm_dill_files",
@@ -907,6 +908,12 @@ group("create_common_sdk") {
     ":write_version_file",
   ]
 
+  if (defined(build_devtools_from_sources) && build_devtools_from_sources) {
+    public_deps += [ ":build_devtools" ]
+  } else {
+    public_deps += [ ":copy_prebuilt_devtools" ]
+  }
+
   # We do not support AOT on ia32 and should therefore not add the
   # dart native compilation files since there is no AOT compiler/runtime
   # available.
diff --git a/tools/build_devtools.py b/tools/build_devtools.py
index 3400f4b75a6..2739f578d8a 100755
--- a/tools/build_devtools.py
+++ b/tools/build_devtools.py
@@ -93,6 +93,7 @@ def main():
             elif os.path.exists(args.output):
                 os.remove(args.output)
             shutil.copytree(build_dir, args.output)
+            shutil.rmtree(build_dir)
 
         print('DevTools build successful.')
         return 0