2 files changed, 35 insertions, 28 deletions
diff --git a/hal/tests/Android.bp b/hal/tests/Android.bp
new file mode 100644
index 0000000..28d9adf
--- /dev/null
+++ b/hal/tests/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2016 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.
+
+// nvram_hal_test
+// ========================================================
+cc_test {
+    name: "nvram_hal_test",
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    shared_libs: [
+        "libhardware",
+        "libcrypto",
+        "libbase",
+    ],
+    static_libs: ["libnvram-hal"],
+    srcs: [
+        "nvram_hal_test.cc",
+        "scoped_nvram_device.cc",
+    ],
+}
diff --git a/hal/tests/Android.mk b/hal/tests/Android.mk
deleted file mode 100644
index 3c2573d..0000000
--- a/hal/tests/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2016 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)
-
-# nvram_hal_test
-# ========================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := nvram_hal_test
-LOCAL_MODULE_TAGS := debug
-LOCAL_CPP_EXTENSION := cc
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_CLANG := true
-LOCAL_SHARED_LIBRARIES := libhardware libcrypto libbase
-LOCAL_STATIC_LIBRARIES := libnvram-hal
-LOCAL_SRC_FILES := nvram_hal_test.cc scoped_nvram_device.cc
-include $(BUILD_NATIVE_TEST)