Enable arm64 neon scrypt implementationoreo-mr1-dev

It seems that old Scrypt-config.mk is unaware of arm64 architecture.
In fact, crypto_scrypt-neon.c can be compiled into arm64 as well.  This
CL adds an arch section for arm64.

Bug: 65425184
Test: adb shell /data/nativetest64/scrypt_test/scrypt_test
Change-Id: Ib451de642c7cc4548bfdc0879781981654b21b8f
Merged-In: If40a30378b8038324aad44071107130d7722e28d

2 files changed, 16 insertions, 0 deletions

diff --git a/scrypt.config b/scrypt.config
index 8099182..f00a3f6 100644
--- a/scrypt.config
+++ b/scrypt.config
@@ -65,6 +65,14 @@ SCRYPT_SOURCES_EXCLUDES_arm_neon="\
 lib/crypto/crypto_scrypt-ref.c \
 "
 
+SCRYPT_SOURCES_arm64="\
+lib/crypto/crypto_scrypt-neon.c \
+"
+
+SCRYPT_SOURCES_EXCLUDES_arm64="\
+lib/crypto/crypto_scrypt-ref.c \
+"
+
 SCRYPT_SOURCES_mips="\
 "
 
diff --git a/sources.bp b/sources.bp
index 39216b1..a2ba3f4 100644
--- a/sources.bp
+++ b/sources.bp
@@ -50,6 +50,14 @@ cc_defaults {
                 ],
             },
         },
+        arm64: {
+            srcs: [
+                "lib/crypto/crypto_scrypt-neon.c",
+            ],
+            exclude_srcs: [
+                "lib/crypto/crypto_scrypt-ref.c",
+            ],
+        },
         x86: {
             srcs: [
                 "lib/crypto/crypto_scrypt-sse.c",