diff options
| author | Mike Frysinger <vapier@google.com> | 2015-11-17 08:25:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-17 08:25:19 +0000 |
| commit | b8d5ebfee36ed52f3fa0deca43f9c03d68036383 (patch) | |
| tree | f213424076ea9f21d15187428c63dd569e753f54 | |
| parent | 628e57850b5611519c17198ab6d456b9f950c3ca (diff) | |
| parent | f244d23feca0086dee4a90e2b0d1106227a41d56 (diff) | |
| download | brillo-b8d5ebfee36ed52f3fa0deca43f9c03d68036383.tar.gz | |
Merge "IA brillo emulator: remove redundant tcp forwarding option"
| -rwxr-xr-x | brilloemulator_x86/base_product/qemu/brilloemulator-x86 | 1 | ||||
| -rwxr-xr-x | brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/brilloemulator_x86/base_product/qemu/brilloemulator-x86 b/brilloemulator_x86/base_product/qemu/brilloemulator-x86 index d14a247..b891fdc 100755 --- a/brilloemulator_x86/base_product/qemu/brilloemulator-x86 +++ b/brilloemulator_x86/base_product/qemu/brilloemulator-x86 @@ -48,6 +48,5 @@ ${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/q -device virtio-blk-pci,drive=userdata \ -drive file="${ANDROID_BUILD_TOP}/out/target/product/brilloemulator_x86/userdata.img,if=none,id=userdata,format=raw" \ -netdev user,id=mynet -device virtio-net-pci,netdev=mynet \ - -redir tcp:5555::5555 \ -vga none \ -L ${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/lib/pc-bios diff --git a/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 b/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 index 6456e95..1cf6015 100755 --- a/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 +++ b/brilloemulator_x86_64/base_product/qemu/brilloemulator-x86_64 @@ -48,6 +48,5 @@ ${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/qemu/linux-x86_64/q -device virtio-blk-pci,drive=userdata \ -drive file="${ANDROID_BUILD_TOP}/out/target/product/brilloemulator_x86_64/userdata.img,if=none,id=userdata,format=raw" \ -netdev user,id=mynet -device virtio-net-pci,netdev=mynet \ - -redir tcp:5555::5555 \ -vga none \ -L ${ANDROID_BUILD_TOP}/prebuilts/android-emulator/linux-x86_64/lib/pc-bios |