Fix libcxx.android.compiler for interface changes.

Test: ./run_tests.py
Bug: http://b/34740564
Change-Id: I68846f5a5a951d5bd368907c662b2c980e1c89a9
This commit is contained in:
Dan Albert
2017-01-26 18:48:20 -08:00
parent e92499f1c9
commit d6a9199c13

View File

@@ -1,3 +1,4 @@
import copy
import os
import re
import shlex
@@ -13,6 +14,9 @@ class AndroidCXXCompiler(libcxx.compiler.CXXCompiler):
self.link_template = link_template
self.build_top = os.getenv('ANDROID_BUILD_TOP')
def copy(self):
return copy.deepcopy(self)
def get_triple(self):
if 'clang' in self.path:
return self.get_clang_triple()
@@ -38,15 +42,15 @@ class AndroidCXXCompiler(libcxx.compiler.CXXCompiler):
return match.group(1)
return None
def compile(self, source_files, out=None, flags=None, env=None, cwd=None):
def compile(self, source_files, out=None, flags=None, cwd=None):
flags = [] if flags is None else flags
return super(AndroidCXXCompiler, self).compile(source_files, out, flags,
env, self.build_top)
self.build_top)
def link(self, source_files, out=None, flags=None, env=None, cwd=None):
def link(self, source_files, out=None, flags=None, cwd=None):
flags = [] if flags is None else flags
return super(AndroidCXXCompiler, self).link(source_files, out, flags,
env, self.build_top)
self.build_top)
def compileCmd(self, source_files, out=None, flags=None):
if out is None: