commit e35afdb1421a9834b4c7a9b5c55ffc1d0c2b4588
author Bill Yi <byi@google.com> Wed Oct 24 14:46:32 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:46:32 2018 -0700
tree 6ddd82161b799040c3ff268a6df1b2afe034eb99
parent c37a330865ad150a993d2c610867312bb2a91e35
parent 1bcd68e1eb76f7ed62002d437f7c26cb1ab6c7dd

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: If2228649d0d5f48fb3abc9868b64bc0983a70311

Android.bp

diff --git a/Android.bp b/Android.bp
index 34c0718..b396340 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,7 +20,7 @@
     name: "libscrypt_static",
     defaults: ["libscrypt_sources"],
     shared_libs: ["libcrypto"],
-    sdk_version: "9",
+    sdk_version: "17",
     host_supported: true,
     vendor_available: true,
 }

sources.bp

diff --git a/sources.bp b/sources.bp
index 8c7f886..4e29880 100644
--- a/sources.bp
+++ b/sources.bp
@@ -27,8 +27,8 @@
         "-DUSE_OPENSSL_PBKDF2",
         "-Wall",
         "-Werror",
-        "-Wno-error=implicit-function-declaration",
-        "-Wno-error=unused-variable",
+        "-Wno-implicit-function-declaration",
+        "-Wno-unused-variable",
     ],
 
     export_include_dirs: [