commit d4bb7dccd4eb0262166ae61f5a084841b2435738
author Dan Willemsen <dwillemsen@google.com> Mon Oct 16 14:29:03 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon Oct 16 14:29:17 2017 -0700
tree 2304859e04c39a178cf049ca298e9daa25a6b7fc
parent 90baa4f79c047b0af04ae6da364c239f09d941d1

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 common
flags/sources/etc can be combined instead of copying them to each
target.

Test: m
Test: mmma external/boringssl
Change-Id: Ie98f6fe70a0c603d89d39f92246cb2e1d39108d6

sources.bp

diff --git a/sources.bp b/sources.bp
index 6f256d0..f303217 100644
--- a/sources.bp
+++ b/sources.bp
@@ -238,7 +238,7 @@
         "src/crypto/x509v3/v3_utl.c",
     ],
     target: {
-        android_arm64: {
+        linux_arm64: {
             srcs: [
                 "linux-aarch64/crypto/chacha/chacha-armv8.S",
                 "linux-aarch64/crypto/fipsmodule/aesv8-armx64.S",
@@ -249,7 +249,7 @@
                 "linux-aarch64/crypto/fipsmodule/sha512-armv8.S",
             ],
         },
-        android_arm: {
+        linux_arm: {
             srcs: [
                 "linux-arm/crypto/chacha/chacha-armv4.S",
                 "linux-arm/crypto/fipsmodule/aes-armv4.S",
@@ -265,7 +265,7 @@
                 "src/crypto/poly1305/poly1305_arm_asm.S",
             ],
         },
-        android_x86: {
+        linux_x86: {
             srcs: [
                 "linux-x86/crypto/chacha/chacha-x86.S",
                 "linux-x86/crypto/fipsmodule/aes-586.S",
@@ -281,46 +281,7 @@
                 "linux-x86/crypto/fipsmodule/x86-mont.S",
             ],
         },
-        linux_glibc_x86: {
-            srcs: [
-                "linux-x86/crypto/chacha/chacha-x86.S",
-                "linux-x86/crypto/fipsmodule/aes-586.S",
-                "linux-x86/crypto/fipsmodule/aesni-x86.S",
-                "linux-x86/crypto/fipsmodule/bn-586.S",
-                "linux-x86/crypto/fipsmodule/co-586.S",
-                "linux-x86/crypto/fipsmodule/ghash-x86.S",
-                "linux-x86/crypto/fipsmodule/md5-586.S",
-                "linux-x86/crypto/fipsmodule/sha1-586.S",
-                "linux-x86/crypto/fipsmodule/sha256-586.S",
-                "linux-x86/crypto/fipsmodule/sha512-586.S",
-                "linux-x86/crypto/fipsmodule/vpaes-x86.S",
-                "linux-x86/crypto/fipsmodule/x86-mont.S",
-            ],
-        },
-        android_x86_64: {
-            srcs: [
-                "linux-x86_64/crypto/chacha/chacha-x86_64.S",
-                "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",
-                "linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/aes-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/aesni-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/ghash-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/md5-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S",
-                "linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/rsaz-avx2.S",
-                "linux-x86_64/crypto/fipsmodule/sha1-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/sha256-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/sha512-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S",
-                "linux-x86_64/crypto/fipsmodule/x86_64-mont.S",
-                "linux-x86_64/crypto/fipsmodule/x86_64-mont5.S",
-                "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
-            ],
-        },
-        linux_glibc_x86_64: {
+        linux_x86_64: {
             srcs: [
                 "linux-x86_64/crypto/chacha/chacha-x86_64.S",
                 "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",