| Index: mojo/public/tools/BUILD.gn
 | 
| diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn
 | 
| index 103c25973a9eb195a6ad5e9c69ae1db8adb34361..e03d1d311696c4b6c5205129bd940286a51137c1 100644
 | 
| --- a/mojo/public/tools/BUILD.gn
 | 
| +++ b/mojo/public/tools/BUILD.gn
 | 
| @@ -2,28 +2,64 @@
 | 
|  # Use of this source code is governed by a BSD-style license that can be
 | 
|  # found in the LICENSE file.
 | 
|  
 | 
| +import("//build/module_args/mojo.gni")
 | 
|  import("../mojo.gni")
 | 
|  
 | 
|  if (use_prebuilt_mojo_shell) {
 | 
|    copy("copy_mojo_shell") {
 | 
|      filename = "mojo_shell"
 | 
| -    if (is_win) {
 | 
| -      filename += ".exe"
 | 
| -    }
 | 
|      if (is_android) {
 | 
|        filename = "MojoShell.apk"
 | 
| -    }
 | 
| -    sources = [
 | 
| -      "prebuilt/$filename",
 | 
| -    ]
 | 
| -    if (is_android) {
 | 
| +      sources = [
 | 
| +        "prebuilt/shell/android-arm/$filename",
 | 
| +      ]
 | 
|        outputs = [
 | 
|          "$root_out_dir/apks/$filename",
 | 
|        ]
 | 
|      } else {
 | 
| +      assert(is_linux)
 | 
| +      sources = [
 | 
| +        "prebuilt/shell/linux-x64/$filename",
 | 
| +      ]
 | 
|        outputs = [
 | 
|          "$root_out_dir/$filename",
 | 
|        ]
 | 
|      }
 | 
|    }
 | 
|  }
 | 
| +
 | 
| +if (use_prebuilt_network_service) {
 | 
| +  copy("copy_network_service") {
 | 
| +    filename = "network_service.mojo"
 | 
| +    if (is_android) {
 | 
| +      sources = [
 | 
| +        "prebuilt/network_service/android-arm/$filename",
 | 
| +      ]
 | 
| +    } else {
 | 
| +      assert(is_linux)
 | 
| +      sources = [
 | 
| +        "prebuilt/network_service/linux-x64/$filename",
 | 
| +      ]
 | 
| +    }
 | 
| +    outputs = [
 | 
| +      "$root_out_dir/$filename",
 | 
| +    ]
 | 
| +  }
 | 
| +
 | 
| +  copy("copy_network_service_apptests") {
 | 
| +    filename = "network_service_apptests.mojo"
 | 
| +    if (is_android) {
 | 
| +      sources = [
 | 
| +        "prebuilt/network_service_apptests/android-arm/$filename",
 | 
| +      ]
 | 
| +    } else {
 | 
| +      assert(is_linux)
 | 
| +      sources = [
 | 
| +        "prebuilt/network_service_apptests/linux-x64/$filename",
 | 
| +      ]
 | 
| +    }
 | 
| +    outputs = [
 | 
| +      "$root_out_dir/$filename",
 | 
| +    ]
 | 
| +  }
 | 
| +}
 | 
| 
 |