{Q-DP1}: Convert Android.mk file to Android.bp
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..f651e69
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,22 @@
+// NCI Configuration
+//ALLOW_MISSING_DEPENDENCIES = ["true"]
+android_app {
+ name: "NfcNci",
+ srcs: [
+ "src/**/*.java",
+ "nci/**/*.java",
+ ],
+ platform_apis: true,
+ certificate: "platform",
+ jni_libs: ["libnfc_nci_jni"],
+ libs: ["com.nxp.nfc"],
+ static_libs: [
+ "android-support-v4",
+ "android-support-core-utils",
+ "android.hardware.secure_element-V1.0-java",
+ "vendor.nxp.nxpwiredse-V1.0-java",
+ ],
+ optimize: {
+ enabled: false,
+ },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100755
index e9e5461..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-########################################
-# NCI Configuration
-########################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-LOCAL_SRC_FILES += \
- $(call all-java-files-under, nci)
-
-LOCAL_PACKAGE_NAME := NfcNci
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libnfc_nci_jni
-
-LOCAL_JAVA_LIBRARIES := com.nxp.nfc
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils
-LOCAL_STATIC_JAVA_LIBRARIES +=android.hardware.secure_element-V1.0-java
-NXP_WIRED_SE:=TRUE
-ifeq ($(NXP_WIRED_SE),TRUE)
- LOCAL_STATIC_JAVA_LIBRARIES += vendor.nxp.nxpwiredse-V1.0-java
-endif
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..1f48c1a
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,30 @@
+// Copyright 2011, 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.
+
+android_test {
+ name: "NfcTests",
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+ static_libs: [
+ "junit",
+ "legacy-android-test",
+ ],
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ certificate: "platform",
+ instrumentation_for: "NfcNci",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 4c27cc5..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2011, 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)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := NfcTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_INSTRUMENTATION_FOR := NfcNci
-
-include $(BUILD_PACKAGE)