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

Don't leak Android hacks to other build platforms.

Browse Source 
Previously, android_compat_hacks.c and android_compat_keywrap.c
were added to crypto_sources when multiple build platforms were
specified in one invocation.

Change-Id: I4fd8bffc4785bef0148d12cd6f292d79c043b806
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Reviewed-on: https://boringssl-review.googlesource.com/6566
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Piotr Sikora 2015-11-23 18:46:33 -08:00 committed by Adam Langley
parent a0ef7b0a56
commit 6ae67dfee8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/generate_build_files.py
View File

@ -150,8 +150,8 @@ class Android(object):
with open('sources.mk', 'w+') as makefile:
makefile.write(self.header)
files['crypto'].extend(self.ExtraFiles())
self.PrintVariableSection(makefile, 'crypto_sources', files['crypto'])
crypto_files = files['crypto'] + self.ExtraFiles()
self.PrintVariableSection(makefile, 'crypto_sources', crypto_files)
self.PrintVariableSection(makefile, 'ssl_sources', files['ssl'])
self.PrintVariableSection(makefile, 'tool_sources', files['tool'])