Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
In the future, target.linux will apply to all targets running a linux kernel
(android, linux_glibc, linux_bionic). So move all current users to the specific
linux_glibc.
There will be another cleanup pass later that will move some instances back to
target.linux if the properties should be shared with target.android and
target.linux_bionic, but target.linux needs to be removed first.
Test: out/soong/build.ninja identical before/after
Change-Id: Iaa9cf0bbbf1473efaec0a7e0778481a8e2c00be4
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",
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)
