kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove android_compat_keywrap.c from generate_build_files.py.

Browse Source 
Now android-standalone is the same as android.

Change-Id: If4cda2f43bea66309c4e5bbd6a62298de72b0e24
Reviewed-on: https://boringssl-review.googlesource.com/11411
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-09-30 21:34:31 -04:00 committed by Adam Langley
parent daa8850c83
commit 8c29e7dfb4
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/generate_build_files.py
View File

@ -79,9 +79,6 @@ class Android(object):
""" """
def ExtraFiles(self):
return ['android_compat_keywrap.c']
def PrintVariableSection(self, out, name, files): def PrintVariableSection(self, out, name, files):
out.write('%s := \\\n' % name) out.write('%s := \\\n' % name)
for f in sorted(files): for f in sorted(files):
@ -96,7 +93,7 @@ class Android(object):
blueprint.write('cc_defaults {\n') blueprint.write('cc_defaults {\n')
blueprint.write(' name: "libcrypto_sources",\n') blueprint.write(' name: "libcrypto_sources",\n')
blueprint.write(' srcs: [\n') blueprint.write(' srcs: [\n')
for f in sorted(files['crypto'] + self.ExtraFiles()): for f in sorted(files['crypto']):
blueprint.write(' "%s",\n' % f) blueprint.write(' "%s",\n' % f)
blueprint.write(' ],\n') blueprint.write(' ],\n')
blueprint.write(' target: {\n') blueprint.write(' target: {\n')
@ -161,8 +158,7 @@ class Android(object):
with open('sources.mk', 'w+') as makefile: with open('sources.mk', 'w+') as makefile:
makefile.write(self.header) makefile.write(self.header)
crypto_files = files['crypto'] + self.ExtraFiles() self.PrintVariableSection(makefile, 'crypto_sources', files['crypto'])
self.PrintVariableSection(makefile, 'crypto_sources', crypto_files)
for ((osname, arch), asm_files) in asm_outputs: for ((osname, arch), asm_files) in asm_outputs:
if osname != 'linux': if osname != 'linux':
@ -171,16 +167,6 @@ class Android(object):
makefile, '%s_%s_sources' % (osname, arch), asm_files) makefile, '%s_%s_sources' % (osname, arch), asm_files)
class AndroidStandalone(Android):
"""AndroidStandalone is for Android builds outside of the Android-system, i.e.
for applications that wish wish to ship BoringSSL.
"""
def ExtraFiles(self):
return []
class Bazel(object): class Bazel(object):
"""Bazel outputs files suitable for including in Bazel files.""" """Bazel outputs files suitable for including in Bazel files."""
@ -710,7 +696,7 @@ def main(platforms):
if __name__ == '__main__': if __name__ == '__main__':
parser = optparse.OptionParser(usage='Usage: %prog [--prefix=<path>]' parser = optparse.OptionParser(usage='Usage: %prog [--prefix=<path>]'
' [android|android-standalone|bazel|gn|gyp]') ' [android|bazel|gn|gyp]')
parser.add_option('--prefix', dest='prefix', parser.add_option('--prefix', dest='prefix',
help='For Bazel, prepend argument to all source files') help='For Bazel, prepend argument to all source files')
options, args = parser.parse_args(sys.argv[1:]) options, args = parser.parse_args(sys.argv[1:])
@ -724,8 +710,6 @@ if __name__ == '__main__':
for s in args: for s in args:
if s == 'android': if s == 'android':
platforms.append(Android()) platforms.append(Android())
elif s == 'android-standalone':
platforms.append(AndroidStandalone())
elif s == 'bazel': elif s == 'bazel':
platforms.append(Bazel()) platforms.append(Bazel())
elif s == 'gn': elif s == 'gn':