Move over to using sources.json from boring.ssl.

- Undo a bunch of hacks in src/boringssl/gen_build_yaml.py - Store the structued data in YAML/dependencies.py so we don't need to recreate the filters. - Update setup.py accordingly
5 years ago · 8e501c86f5
parent cdf2f2f8a3
commit 8e501c86f5
4 changed files with 141 additions and 111 deletions
--- a/setup.py
+++ b/setup.py
@ -272,24 +272,23 @@ if BUILD_WITH_SYSTEM_CARES:
 DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
 asm_files = []
 NO_BORING_ASM = True
+
+asm_key = ''
 if BUILD_WITH_BORING_SSL_ASM:
-    LINUX_X86_64 = "linux-x86_64"
-    LINUX_ARM = "linux-arm"
-    if LINUX_X86_64 == util.get_platform() or LINUX_ARM == util.get_platform():
-        platform = LINUX_X86_64 if LINUX_X86_64 == util.get_platform() else LINUX_ARM
-        asm_files = [f for f in grpc_core_dependencies.ASM_SOURCE_FILES
-                    if (platform in f or "hrss/asm" in f)
-                    and "test" not in f]
-        NO_BORING_ASM = False
+    LINUX_X86_64 = 'linux-x86_64'
+    LINUX_ARM = 'linux-arm'
+    if LINUX_X86_64 == util.get_platform():
+        asm_key = 'crypto_linux_x86_64'
+    elif LINUX_ARM == util.get_platform():
+        asm_key = 'crypto_linux_arm'
    elif "mac" in util.get_platform() and "x86_64" in util.get_platform():
-        asm_files = [f for f in grpc_core_dependencies.ASM_SOURCE_FILES
-                     if ("mac-x86_64" in f or "hrss/asm" in f)
-                     and "test" not in f]
-        NO_BORING_ASM = False
+        asm_key = 'crypto_mac_x86_64'
    else:
       print("ASM Builds for BoringSSL currently not supported on:",
             util.get_platform())
-if NO_BORING_ASM:
+if asm_key:
+   asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key]
+else:
   DEFINE_MACROS += (('OPENSSL_NO_ASM', 1),)

 if not DISABLE_LIBC_COMPATIBILITY:
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@ -46,6 +46,11 @@ class Grpc(object):

    def WriteFiles(self, files):
        test_binaries = ['ssl_test', 'crypto_test']
+        asm_outputs = {key: value
+                       for key, value in files.items()
+                       if any(
+                          f.endswith(".S") or f.endswith(".asm")
+                          for f in value)}
        self.yaml = {
            '#':
                'generated with src/boringssl/gen_build_yaml.py',
@ -66,8 +71,8 @@ class Grpc(object):
                        sorted(
                            map_dir(f) for f in files['ssl'] + files['crypto']),
                    'asm_src':
-                        sorted(map_dir(f)
-                               for _, srcs in asm_outputs for f in srcs),
+                        {k: [map_dir(f) for f in value]
+                         for k, value in asm_outputs.items()},
                    'headers':
                        sorted(
                            map_dir(f)
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -905,53 +905,79 @@ CORE_SOURCE_FILES = [
    'third_party/zlib/uncompr.c',
    'third_party/zlib/zutil.c',
 ]
-ASM_SOURCE_FILES = [
+
+ASM_SOURCE_FILES = {
+  'crypto_ios_aarch64': [
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/chacha/chacha-armv8.S',
+    'third_party/boringssl-with-bazel/ios-aarch64/crypto/test/trampoline-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/armv8-mont.S',
-    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S',
+    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/sha1-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/sha256-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/sha512-armv8.S',
    'third_party/boringssl-with-bazel/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S',
-    'third_party/boringssl-with-bazel/ios-aarch64/crypto/test/trampoline-armv8.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/chacha/chacha-armv4.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/aesv8-armx32.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/armv4-mont.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/bsaes-armv7.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/ghash-armv4.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/ghashv8-armx32.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha1-armv4-large.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha256-armv4.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha512-armv4.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/vpaes-armv7.S',
-    'third_party/boringssl-with-bazel/ios-arm/crypto/test/trampoline-armv4.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/chacha/chacha-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/armv8-mont.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha1-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha256-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha512-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S',
-    'third_party/boringssl-with-bazel/linux-aarch64/crypto/test/trampoline-armv8.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/chacha/chacha-armv4.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/aesv8-armx32.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/armv4-mont.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/bsaes-armv7.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghash-armv4.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghashv8-armx32.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha1-armv4-large.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha256-armv4.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha512-armv4.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/vpaes-armv7.S',
-    'third_party/boringssl-with-bazel/linux-arm/crypto/test/trampoline-armv4.S',
+  ],
+  'crypto_mac_x86_64': [
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/chacha/chacha-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/test/trampoline-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/md5-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S',
+    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/x86_64-mont.S',
+  ],
+  'crypto_win_x86': [
+    'third_party/boringssl-with-bazel/win-x86/crypto/chacha/chacha-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/test/trampoline-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/aesni-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/bn-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/co-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-ssse3-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/md5-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha1-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha256-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha512-586.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/vpaes-x86.asm',
+    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/x86-mont.asm',
+  ],
+  'crypto_linux_ppc64le': [
+    'third_party/boringssl-with-bazel/linux-ppc64le/crypto/test/trampoline-ppc.S',
    'third_party/boringssl-with-bazel/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S',
    'third_party/boringssl-with-bazel/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S',
-    'third_party/boringssl-with-bazel/linux-ppc64le/crypto/test/trampoline-ppc.S',
+  ],
+  'crypto_mac_x86': [
+    'third_party/boringssl-with-bazel/mac-x86/crypto/chacha/chacha-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/test/trampoline-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/aesni-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/bn-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/co-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/ghash-ssse3-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/ghash-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/md5-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha1-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha256-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha512-586.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/vpaes-x86.S',
+    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/x86-mont.S',
+  ],
+  'crypto_linux_x86': [
    'third_party/boringssl-with-bazel/linux-x86/crypto/chacha/chacha-x86.S',
+    'third_party/boringssl-with-bazel/linux-x86/crypto/test/trampoline-x86.S',
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/aesni-x86.S',
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/bn-586.S',
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/co-586.S',
@ -963,10 +989,25 @@ ASM_SOURCE_FILES = [
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha512-586.S',
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/vpaes-x86.S',
    'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/x86-mont.S',
-    'third_party/boringssl-with-bazel/linux-x86/crypto/test/trampoline-x86.S',
+  ],
+  'crypto_ios_arm': [
+    'third_party/boringssl-with-bazel/ios-arm/crypto/chacha/chacha-armv4.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/test/trampoline-armv4.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/aesv8-armx32.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/armv4-mont.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/bsaes-armv7.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/ghash-armv4.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/ghashv8-armx32.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha1-armv4-large.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha256-armv4.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/sha512-armv4.S',
+    'third_party/boringssl-with-bazel/ios-arm/crypto/fipsmodule/vpaes-armv7.S',
+  ],
+  'crypto_linux_x86_64': [
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/chacha/chacha-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S',
+    'third_party/boringssl-with-bazel/linux-x86_64/crypto/test/trampoline-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S',
@ -980,60 +1021,15 @@ ASM_SOURCE_FILES = [
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S',
-    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont.S',
    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S',
-    'third_party/boringssl-with-bazel/linux-x86_64/crypto/test/trampoline-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/chacha/chacha-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/aesni-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/bn-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/co-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/ghash-ssse3-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/ghash-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/md5-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha1-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha256-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/sha512-586.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/vpaes-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/fipsmodule/x86-mont.S',
-    'third_party/boringssl-with-bazel/mac-x86/crypto/test/trampoline-x86.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/chacha/chacha-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/md5-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/x86_64-mont.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S',
-    'third_party/boringssl-with-bazel/mac-x86_64/crypto/test/trampoline-x86_64.S',
-    'third_party/boringssl-with-bazel/src/crypto/curve25519/asm/x25519-asm-arm.S',
+    'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont.S',
    'third_party/boringssl-with-bazel/src/crypto/hrss/asm/poly_rq_mul.S',
-    'third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm_asm.S',
-    'third_party/boringssl-with-bazel/win-x86/crypto/chacha/chacha-x86.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/aesni-x86.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/bn-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/co-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-ssse3-x86.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-x86.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/md5-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha1-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha256-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha512-586.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/vpaes-x86.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/x86-mont.asm',
-    'third_party/boringssl-with-bazel/win-x86/crypto/test/trampoline-x86.asm',
+  ],
+  'crypto_win_x86_64': [
    'third_party/boringssl-with-bazel/win-x86_64/crypto/chacha/chacha-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm',
+    'third_party/boringssl-with-bazel/win-x86_64/crypto/test/trampoline-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm',
@ -1047,7 +1043,34 @@ ASM_SOURCE_FILES = [
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm',
-    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont.asm',
    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm',
-    'third_party/boringssl-with-bazel/win-x86_64/crypto/test/trampoline-x86_64.asm',
-]
+    'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont.asm',
+  ],
+  'crypto_linux_aarch64': [
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/chacha/chacha-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/test/trampoline-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/armv8-mont.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha1-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha256-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha512-armv8.S',
+    'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S',
+  ],
+  'crypto_linux_arm': [
+    'third_party/boringssl-with-bazel/linux-arm/crypto/chacha/chacha-armv4.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/test/trampoline-armv4.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/aesv8-armx32.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/armv4-mont.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/bsaes-armv7.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghash-armv4.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghashv8-armx32.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha1-armv4-large.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha256-armv4.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha512-armv4.S',
+    'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/vpaes-armv7.S',
+    'third_party/boringssl-with-bazel/src/crypto/curve25519/asm/x25519-asm-arm.S',
+    'third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm_asm.S',
+  ],
+}
--- a/templates/src/python/grpcio/grpc_core_dependencies.py.template
+++ b/templates/src/python/grpcio/grpc_core_dependencies.py.template
@ -17,24 +17,27 @@
  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_core_dependencies.py.template`!!!
  <%
    srcs = []
-    asm_srcs = []
+    asm_srcs = {}
    for lib in libs:
      if lib.name in python_dependencies.transitive_deps:
        for src in lib.src:
          srcs.append(src)
      if hasattr(lib, 'asm_src'):
-        for src in lib.asm_src:
-          asm_srcs.append(src)
+        asm_srcs = lib.asm_src
    srcs = sorted(set(srcs))
-    asm_srcs = sorted(set(asm_srcs))
  %>
  CORE_SOURCE_FILES = [
  % for src in srcs:
      '${src}',
  % endfor
  ]
-  ASM_SOURCE_FILES = [
-  % for src in asm_srcs:
+
+  ASM_SOURCE_FILES = {
+  % for asm, asm_src in asm_srcs.iteritems():
+    '${asm}': [
+    % for src in asm_src:
      '${src}',
+    % endfor
+    ],
  % endfor
-  ]
+  }