From 2eb4bc5e894cedd6c6f36ed9eeb6246acb9dfb3c Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 16 Oct 2017 14:37:00 -0700 Subject: [PATCH] Android.bp: Use target.linux for all linux kernel based targets Now in Android.bp files, target.linux applies to all targets running a linux kernel (android, linux_glibc, linux_bionic). So we can now share sources between android and linux hosts. Tested with: https://android-review.googlesource.com/#/c/platform/external/boringssl/+/512517 Change-Id: I9c503f48cea17780e02bb38b419078a457d54f66 Reviewed-on: https://boringssl-review.googlesource.com/22004 Reviewed-by: Robert Sloan Reviewed-by: David Benjamin Commit-Queue: David Benjamin CQ-Verified: CQ bot account: commit-bot@chromium.org --- util/generate_build_files.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/util/generate_build_files.py b/util/generate_build_files.py index a0d0d490..738484d4 100644 --- a/util/generate_build_files.py +++ b/util/generate_build_files.py @@ -106,21 +106,13 @@ class Android(object): if arch == 'aarch64': arch = 'arm64' - blueprint.write(' android_%s: {\n' % arch) + blueprint.write(' linux_%s: {\n' % arch) blueprint.write(' srcs: [\n') for f in sorted(asm_files): blueprint.write(' "%s",\n' % f) blueprint.write(' ],\n') blueprint.write(' },\n') - if arch == 'x86' or arch == 'x86_64': - blueprint.write(' linux_%s: {\n' % arch) - blueprint.write(' srcs: [\n') - for f in sorted(asm_files): - blueprint.write(' "%s",\n' % f) - blueprint.write(' ],\n') - blueprint.write(' },\n') - blueprint.write(' },\n') blueprint.write('}\n\n')