Modified architecture of NFC HAL 1.1 code am: 2be377b548
am: 43a42869c3
Change-Id: I307a63f3218eba2ac555d8352d909d7b775fdb35
diff --git a/1.1/Android.bp b/1.1/Android.bp
new file mode 100644
index 0000000..469e520
--- /dev/null
+++ b/1.1/Android.bp
@@ -0,0 +1,40 @@
+//
+// Copyright (C) 2018 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_binary {
+ name: "android.hardware.nfc@1.1-service.st",
+ defaults: ["hidl_defaults"],
+ proprietary: true,
+ init_rc: ["android.hardware.nfc@1.1-service.st.rc"],
+ relative_install_path: "hw",
+ srcs: [
+ "StNfcService.cpp",
+ "Nfc.cpp",
+ "hal_st21nfc.cc"
+ ],
+
+ shared_libs: [
+ "nfc_nci.st21nfc.default",
+ "libbase",
+ "libcutils",
+ "libhardware",
+ "liblog",
+ "libutils",
+ "android.hardware.nfc@1.0",
+ "android.hardware.nfc@1.1",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ ],
+}
diff --git a/1.1/StNfcService.cpp b/1.1/StNfcService.cpp
index 5b42572..66891b1 100644
--- a/1.1/StNfcService.cpp
+++ b/1.1/StNfcService.cpp
@@ -17,7 +17,7 @@
*
******************************************************************************/
-#define LOG_TAG "stnfc@1.0-service.st"
+#define LOG_TAG "stnfc@1.1-service.st"
#include <android/hardware/nfc/1.1/INfc.h>
#include <hidl/LegacySupport.h>
diff --git a/st21nfc/include/StNfc_hal_api.h b/1.1/StNfc_hal_api.h
similarity index 100%
rename from st21nfc/include/StNfc_hal_api.h
rename to 1.1/StNfc_hal_api.h
diff --git a/st21nfc/hal_st21nfc.cc b/1.1/hal_st21nfc.cc
similarity index 100%
rename from st21nfc/hal_st21nfc.cc
rename to 1.1/hal_st21nfc.cc
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 82e47bc..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (C) 2018 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_shared {
- name: "nfc_nci.st21nfc.default",
- defaults: ["hidl_defaults"],
- proprietary: true,
-
- cflags: [
- "-DST21NFC",
- "-Wall",
- "-Werror",
- "-Wextra",
- ],
-
- srcs: [
- "st21nfc/adaptation/android_logmsg.cpp",
- "st21nfc/adaptation/config.cpp",
- "st21nfc/adaptation/i2clayer.cc",
- "st21nfc/hal/halcore.cc",
- "st21nfc/hal_wrapper.cc",
- "st21nfc/hal_st21nfc.cc",
- ],
-
- local_include_dirs: [
- "st21nfc/gki/common",
- "st21nfc/gki/ulinux",
- "st21nfc/hal",
- "st21nfc/include",
- ],
-
- export_include_dirs: [
- "st21nfc/include",
- ],
- shared_libs: [
- "android.hardware.nfc@1.0",
- "android.hardware.nfc@1.1",
- "libbase",
- "libcutils",
- "libhardware",
- "libhardware_legacy",
- "libhidlbase",
- "libhidltransport",
- "liblog",
- "libutils",
- ],
-}
-
-cc_binary {
- name: "android.hardware.nfc@1.1-service.st",
- defaults: ["hidl_defaults"],
- proprietary: true,
- init_rc: ["1.1/android.hardware.nfc@1.1-service.st.rc"],
- relative_install_path: "hw",
- srcs: [
- "1.1/StNfcService.cpp",
- "1.1/Nfc.cpp",
- ],
-
- shared_libs: [
- "nfc_nci.st21nfc.default",
- "libbase",
- "libcutils",
- "libhardware",
- "liblog",
- "libutils",
- "android.hardware.nfc@1.0",
- "android.hardware.nfc@1.1",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- ],
-}
diff --git a/st21nfc/Android.bp b/st21nfc/Android.bp
new file mode 100644
index 0000000..4530901
--- /dev/null
+++ b/st21nfc/Android.bp
@@ -0,0 +1,56 @@
+//
+// Copyright (C) 2018 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_shared {
+ name: "nfc_nci.st21nfc.default",
+ defaults: ["hidl_defaults"],
+ proprietary: true,
+
+ cflags: [
+ "-DST21NFC",
+ "-Wall",
+ "-Werror",
+ "-Wextra",
+ ],
+
+ srcs: [
+ "adaptation/android_logmsg.cpp",
+ "adaptation/config.cpp",
+ "adaptation/i2clayer.cc",
+ "hal/halcore.cc",
+ "hal_wrapper.cc",
+ ],
+
+ local_include_dirs: [
+ "gki/common",
+ "gki/ulinux",
+ "hal",
+ "include",
+ ],
+
+ export_include_dirs: [
+ "include",
+ "gki/ulinux",
+ ],
+ shared_libs: [
+ "libbase",
+ "libcutils",
+ "libhardware",
+ "libhardware_legacy",
+ "libhidlbase",
+ "libhidltransport",
+ "liblog",
+ "libutils",
+ ],
+}