Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144

* changes:
  Enable arm64 neon scrypt implementation
  Mark libscrypt_static as vendor_available
  Convert Android.mk to Android.bp
  Fix import_scrypt.sh

1 files changed, 33 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ef9b8a0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+build = ["sources.bp"]
+
+cc_library_static {
+    name: "libscrypt_static",
+    defaults: ["libscrypt_sources"],
+    shared_libs: ["libcrypto"],
+    sdk_version: "9",
+    host_supported: true,
+    vendor_available: true,
+}
+
+cc_test {
+    name: "scrypt_test",
+    srcs: ["tests/scrypt_test.cpp"],
+    shared_libs: ["libcrypto"],
+    static_libs: ["libscrypt_static"],
+}