| Index: mojo/public/tools/BUILD.gn
|
| diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn
|
| index e584e1f41b1dd30dfd74249f817efc640c71fd48..30c146d43f46ecae42e66fb0a7373bf227b54ee0 100644
|
| --- a/mojo/public/tools/BUILD.gn
|
| +++ b/mojo/public/tools/BUILD.gn
|
| @@ -31,16 +31,26 @@ if (use_prebuilt_mojo_shell) {
|
| if (use_prebuilt_network_service) {
|
| copy("copy_network_service") {
|
| filename = "network_service.mojo"
|
| - if (is_android) {
|
| + if (defined(prebuilt_network_service_location) &&
|
| + prebuilt_network_service_location != "") {
|
| sources = [
|
| - "prebuilt/network_service/android-arm/$filename",
|
| + "$prebuilt_network_service_location",
|
| ]
|
| } else {
|
| - assert(is_linux)
|
| - sources = [
|
| - "prebuilt/network_service/linux-x64/$filename",
|
| - ]
|
| + if (is_android) {
|
| + assert(cpu_arch == "arm",
|
| + "Only arm version prebuilt netowrk_service.mojo is available.")
|
| + sources = [
|
| + "prebuilt/network_service/android-arm/$filename",
|
| + ]
|
| + } else {
|
| + assert(is_linux)
|
| + sources = [
|
| + "prebuilt/network_service/linux-x64/$filename",
|
| + ]
|
| + }
|
| }
|
| +
|
| outputs = [
|
| "$root_out_dir/$filename",
|
| ]
|
|
|