commit c9df3a1ff1d0cddebf2fc32ad8a03a429c0e834c
author Dan Willemsen <dwillemsen@google.com> Tue Oct 03 16:04:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 16:04:41 2017 +0000
tree e4e76779787c64ff9c79b9a966566cae2e521dfe
parent 4562e9da35e342a38f90017dc2b8ff1317213db8
parent 2c01bca87fd84b319cfcaa71b6aa4f28325aaa4d

Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"

sources.bp

diff --git a/sources.bp b/sources.bp
index a1bafca..6f256d0 100644
--- a/sources.bp
+++ b/sources.bp
@@ -281,7 +281,7 @@
                 "linux-x86/crypto/fipsmodule/x86-mont.S",
             ],
         },
-        linux_x86: {
+        linux_glibc_x86: {
             srcs: [
                 "linux-x86/crypto/chacha/chacha-x86.S",
                 "linux-x86/crypto/fipsmodule/aes-586.S",
@@ -320,7 +320,7 @@
                 "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
             ],
         },
-        linux_x86_64: {
+        linux_glibc_x86_64: {
             srcs: [
                 "linux-x86_64/crypto/chacha/chacha-x86_64.S",
                 "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",

src/util/generate_build_files.py

diff --git a/src/util/generate_build_files.py b/src/util/generate_build_files.py
index 4feb4df..aaefa46 100644
--- a/src/util/generate_build_files.py
+++ b/src/util/generate_build_files.py
@@ -114,7 +114,7 @@
         blueprint.write('        },\n')
 
         if arch == 'x86' or arch == 'x86_64':
-          blueprint.write('        linux_%s: {\n' % arch)
+          blueprint.write('        linux_glibc_%s: {\n' % arch)
           blueprint.write('            srcs: [\n')
           for f in sorted(asm_files):
             blueprint.write('                "%s",\n' % f)