commit 4b6a0bdde7c5b4d203c2ee53c471ca6af71801f4
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 21 03:29:03 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 21 03:29:03 2020 +0000
tree 0a7b7ef1b2af8a7a9c65ccdc1c89638933ddd121
parent a538f5abf01a32a6943eba6aecc33a48ffa35a9f
parent de73b7ba33a73ae5cba35a3be7809153b030e91d

Snap for 6224475 from de73b7ba33a73ae5cba35a3be7809153b030e91d to rvc-release

Change-Id: Ibd8a235032215c04ad915ae2e0a671123579cf64

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;