tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix last python3 issues." am: e6b7969dd1

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1682596

Change-Id: I64118c75d8599d441412caa6cdff56436c1facc6
This commit is contained in:
Christopher Ferris 2021-04-21 20:18:41 +00:00 committed by Automerger Merge Worker
commit f7c9df48a1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,2 @@
*.pyc
*.*~
libc/kernel/original

10
libc/kernel/tools/cpp.py
View file

@ -14,7 +14,7 @@ if top is None:
utils.panic('ANDROID_BUILD_TOP not set.\n')
# Set up the env vars for libclang.
site.addsitedir(os.path.join(top, 'external/clang/bindings/python'))
site.addsitedir(os.path.join(top, 'prebuilts/clang/host/linux-x86/clang-stable/lib64/python3/site-packages/'))
import clang.cindex
from clang.cindex import conf
@ -28,7 +28,7 @@ from clang.cindex import TranslationUnit
# Set up LD_LIBRARY_PATH to include libclang.so, libLLVM.so, and etc.
# Note that setting LD_LIBRARY_PATH with os.putenv() sometimes doesn't help.
clang.cindex.Config.set_library_file(os.path.join(top, 'prebuilts/sdk/tools/linux/lib64/libclang_android.so'))
clang.cindex.Config.set_library_file(os.path.join(top, 'prebuilts/clang/host/linux-x86/clang-stable/lib64/libclang.so'))
from defaults import *
@ -254,7 +254,7 @@ class CppTokenizer(object):
token_group = TokenGroup(self._tu, tokens_memory, tokens_count)
tokens = []
for i in xrange(0, count):
for i in range(0, count):
token = Token(self._tu, token_group,
int_data=tokens_array[i].int_data,
ptr_data=tokens_array[i].ptr_data,
@ -722,7 +722,7 @@ class CppExpr(object):
if op == "defined":
op, name = e
if macros.has_key(name):
if name in macros:
if macros[name] == kCppUndefinedMacro:
return ("int", 0)
else:
@ -739,7 +739,7 @@ class CppExpr(object):
elif op == "ident":
op, name = e
if macros.has_key(name):
if name in macros:
try:
value = int(macros[name])
expanded = ("int", value)