Remove the old asm lists from JSON and android-cmake output

The android-cmake one should no longer be needed as of aosp/2673299, and
the JSON one as of https://github.com/grpc/grpc/pull/33700

Bug: 542
Change-Id: I3c7b752806d82a5a01b5ad9180771e88d2810b70
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62185
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Auto-Submit: David Benjamin <davidben@google.com>

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index d0c01d5..b3ce2d3 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -224,12 +224,6 @@
                                 files['crypto_test'])
       self.PrintVariableSection(out, 'ssl_test_sources', files['ssl_test'])
 
-      # TODO(crbug.com/boringssl/542): Migrate users to the combined asm source
-      # lists, so we don't need to generate both sets.
-      for ((osname, arch), asm_files) in asm_outputs:
-        self.PrintVariableSection(
-            out, 'crypto_sources_%s_%s' % (osname, arch), asm_files)
-
 
 class Bazel(object):
   """Bazel outputs files suitable for including in Bazel files."""
@@ -565,13 +559,8 @@
 
 class JSON(object):
   def WriteFiles(self, files, asm_outputs):
-    sources = dict(files)
-    # TODO(crbug.com/boringssl/542): Migrate users to the combined asm source
-    # lists, so we don't need to generate both sets.
-    for ((osname, arch), asm_files) in asm_outputs:
-      sources['crypto_%s_%s' % (osname, arch)] = asm_files
     with open('sources.json', 'w+') as f:
-      json.dump(sources, f, sort_keys=True, indent=2)
+      json.dump(files, f, sort_keys=True, indent=2)
 
 def FindCMakeFiles(directory):
   """Returns list of all CMakeLists.txt files recursively in directory."""