[Bazel] Fix mobile-install for python2

ThomasCJY · copybara-github · commit 48eee8b4b447 · 2021-04-21T17:56:15.000-07:00
**Background** Fix issue introduced by 1049fe8 It turns out the queue module name is inconsistent across different python versions. We found that: * On some macos system: - python2 contains both queue and Queue module. All python2 contains Queue module - python3 only contains queue module * On some Linux system - python2 contains only Queue module. - python3 only contains queue module Therefore, some developers are seeing `ImportError: No module named queue` errors locally on linux machine after using mobile-install. **Change** Import correct Queue module instead **Test** Local test pass Closes #12540. PiperOrigin-RevId: 369773133
diff --git a/tools/android/build_incremental_dexmanifest.py b/tools/android/build_incremental_dexmanifest.py
@@ -32,7 +32,13 @@
 
 import hashlib
 import os
-from queue import Queue
+# pylint: disable=g-import-not-at-top
+try:
+  # python2 without compatibility package
+  from Queue import Queue
+except ImportError:
+  # python3
+  from queue import Queue
 import shutil
 import sys
 import tempfile
