commit c547d8f0b06e97aaae55eaac21d259bd475cadd5
author Alex Light <allight@google.com> Thu Nov 21 13:29:13 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 21 13:29:13 2019 -0800
tree 976970568bb3d1710b016c70e943d481d1ac096d
parent 97c271392806537fc7593996163c85b73bebb31b
parent aa8a88f3a99a45c53baaac6423250d6d03ccf77a

Android: Workaround prebuilt python issue
am: aa8a88f3a9

Change-Id: I783ae40db4aa9739fd5178c86ccd2130d67cc190

cpplint/cpplint.py

diff --git a/cpplint/cpplint.py b/cpplint/cpplint.py
index 6c839b4..d069b6d 100755
--- a/cpplint/cpplint.py
+++ b/cpplint/cpplint.py
@@ -4295,13 +4295,16 @@
         # Issue 337
         # https://mail.python.org/pipermail/python-list/2012-August/628809.html
         if (sys.version_info.major, sys.version_info.minor) <= (3, 2):
-          # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81
-          is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4
-          # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564
-          is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF
-          if not is_wide_build and is_low_surrogate:
-            width -= 1
-          
+          try:
+            # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81
+            is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4
+            # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564
+            is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF
+            if not is_wide_build and is_low_surrogate:
+              width -= 1
+          except ImportError:
+            # Android prebuilt python ends up CHECK-failing here due to how it's compiled.
+            pass
         width += 1
     return width
   else: