release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440

Change-Id: Icfa9484abc982fe0db16c631a5f46c5df5fd24d0
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a65d618
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,25 @@
+// Copyright 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_static {
+    name: "lmfit",
+    vendor: true,
+
+    srcs: [
+        "lib/lmcurve.c",
+        "lib/lmcurve_tyd.c",
+        "lib/lmmin.c",
+    ],
+    export_include_dirs: ["lib"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 14cc2b9..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    lib/lmcurve.c \
-    lib/lmcurve_tyd.c \
-    lib/lmmin.c
-
-LOCAL_MODULE := lmfit
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-