commit 0b34c98822c03c3493f94bc4a103de32415df3cc
author Bo Hu <bohu@google.com> Mon Nov 28 22:50:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 28 22:50:34 2016 +0000
tree 58ea738de273bbb2647d01a42610e7425777c18c
parent c7cc4a2f1c5f1f60e82bc78f46ab6459262f8178
parent 7a335fc8655788f60107da2a137d6979d9fc0109

Merge "Do not init slirp proxy when op_http_proxy is null" into emu-master-dev

android-qemu2-glue/main.cpp

diff --git a/android-qemu2-glue/main.cpp b/android-qemu2-glue/main.cpp
index 8dc27b5..17afd2d 100755
--- a/android-qemu2-glue/main.cpp
+++ b/android-qemu2-glue/main.cpp
@@ -715,7 +715,7 @@
     // Set env var to "on" for Intel PMU if the feature is enabled.
     // cpu.c will then read that.
     if (android::featurecontrol::isEnabled(android::featurecontrol::IntelPerformanceMonitoringUnit)) {
-        setenv("ANDROID_EMU_FEATURE_IntelPerformanceMonitoringUnit", "on", 1);
+        System::get()->envSet("ANDROID_EMU_FEATURE_IntelPerformanceMonitoringUnit", "on");
     }
 
 #if defined(TARGET_X86_64) || defined(TARGET_I386)