commit 2eb4bc5e894cedd6c6f36ed9eeb6246acb9dfb3c
author Dan Willemsen <dwillemsen@google.com> Mon Oct 16 14:37:00 2017 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Oct 17 02:34:59 2017 +0000
tree 9ac6e319c9f212141ca11312e09e1521a53ca9a3
parent 619c8cec8391068e483747cfce354a8d756e77ac

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 <varomodt@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index a0d0d49..738484d 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -106,21 +106,13 @@
         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')