commit f6348c2ae9322c096d93034c54a06616c3594341
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Mar 03 23:07:03 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Mar 03 23:07:03 2020 +0000
tree 0a7b7ef1b2af8a7a9c65ccdc1c89638933ddd121
parent 1524e8c898e2b8731f83db67487fe97195a0041f
parent a3fd3e491d9a411d074a807f1543c44ea0554c0f

Snap for 6258215 from a3fd3e491d9a411d074a807f1543c44ea0554c0f to r-keystone-qcom-release

Change-Id: I605cebe727f70bab585cd82f6b275ee39c8ebd4b

android/launcher_main.cpp

diff --git a/android/launcher_main.cpp b/android/launcher_main.cpp
index cdf3bd1..eb12871 100644
--- a/android/launcher_main.cpp
+++ b/android/launcher_main.cpp
@@ -130,6 +130,9 @@
 
   config.write_bytecode = 0;
 
+  // We've already parsed argv in PyConfig_Read
+  config.parse_argv = 0;
+
   status = Py_InitializeFromConfig(&config);
   if (PyStatus_Exception(status)) {
     goto fail;