Snap for 4500033 from 1c19ec4fd68299425481c2dd4f41448073d746e7 to pi-release

Change-Id: Icf283e9ec5f0179d7b13647964fb7d6a70359b97
diff --git a/Android.bp b/Android.bp
index 0ca3b5f..ca3521a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,12 +1,25 @@
+// 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.
+
 cc_library_headers {
     name: "libtextclassifier_hash_headers",
     vendor_available: true,
     export_include_dirs: ["."],
 }
 
-cc_library_shared {
-    name: "libtextclassifier_hash",
-    vendor_available: true,
+cc_defaults {
+    name: "libtextclassifier_hash_defaults",
     srcs: [
         "util/hash/farmhash.cc",
         "util/hash/hash.cc"
@@ -18,3 +31,16 @@
         "-Wno-unused-function",
     ],
 }
+
+cc_library_shared {
+    name: "libtextclassifier_hash",
+    defaults: ["libtextclassifier_hash_defaults"],
+    vendor_available: true,
+}
+
+cc_library_static {
+    name: "libtextclassifier_hash_static",
+    defaults: ["libtextclassifier_hash_defaults"],
+    sdk_version: "current",
+    stl: "libc++_static",
+}