commit 12d60fff2dbf958843943db6f92fdee53d45f1c3
author Pirama Arumuga Nainar <pirama@google.com> Wed Jun 06 18:58:32 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 06 18:58:32 2018 -0700
tree 8aeb9d70723a3f84dcf7683e06dbf0e58f00dd32
parent 0e46560024bc678c74dc1a2fa43afb5e9b117f4e
parent 8e5efba6010d1b0c3f63b6122afa72c620aa3d04

Merge "Fix exit-time-destructor warning" am: ae74e42d25
am: a40b43eb45

Change-Id: I949f06ec7335a9f0fd6b285885b214d0cbe038b9

adb/client/usb_windows.cpp

diff --git a/adb/client/usb_windows.cpp b/adb/client/usb_windows.cpp
index 9751ebf..f529e8f 100644
--- a/adb/client/usb_windows.cpp
+++ b/adb/client/usb_windows.cpp
@@ -75,7 +75,7 @@
 static const GUID usb_class_id = ANDROID_USB_CLASS_ID;
 
 /// List of opened usb handles
-static std::vector<usb_handle*> handle_list;
+static std::vector<usb_handle*>& handle_list = *new std::vector<usb_handle*>();
 
 /// Locker for the list of opened usb handles
 static std::mutex& usb_lock = *new std::mutex();