gzosp/interfaces: Move fingerprint 2.0 service to fingerprint/2.0

Change-Id: I5072c69c57e93c9e5c7567978762dc0c2da24a0e

6 files changed, 35 insertions, 32 deletions

diff --git a/biometrics/fingerprint/2.0/Android.bp b/biometrics/fingerprint/2.0/Android.bp
new file mode 100644
index 0000000..372f84e
--- /dev/null
+++ b/biometrics/fingerprint/2.0/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2017 The Android Open Source Project
+// Copyright (C) 2017 The LineageOS 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.biometrics.fingerprint@2.0-service",
+    defaults: ["hidl_defaults"],
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.biometrics.fingerprint@2.0-service.rc"],
+    srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
+    shared_libs: [
+        "libutils",
+        "liblog",
+        "libhidlbase",
+        "libhidltransport",
+        "libhardware",
+        "libhwbinder",
+        "android.hardware.biometrics.fingerprint@2.1",
+    ],
+    proprietary: true,
+}
diff --git a/biometrics/fingerprint/BiometricsFingerprint.cpp b/biometrics/fingerprint/2.0/BiometricsFingerprint.cpp
index 3c5b78f..3c5b78f 100644
--- a/biometrics/fingerprint/BiometricsFingerprint.cpp
+++ b/biometrics/fingerprint/2.0/BiometricsFingerprint.cpp
diff --git a/biometrics/fingerprint/BiometricsFingerprint.h b/biometrics/fingerprint/2.0/BiometricsFingerprint.h
index 6d64e3d..6d64e3d 100644
--- a/biometrics/fingerprint/BiometricsFingerprint.h
+++ b/biometrics/fingerprint/2.0/BiometricsFingerprint.h
diff --git a/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc b/biometrics/fingerprint/2.0/android.hardware.biometrics.fingerprint@2.0-service.rc
index 7d7ee76..7d7ee76 100644
--- a/biometrics/fingerprint/android.hardware.biometrics.fingerprint@2.0-service.rc
+++ b/biometrics/fingerprint/2.0/android.hardware.biometrics.fingerprint@2.0-service.rc
diff --git a/biometrics/fingerprint/service.cpp b/biometrics/fingerprint/2.0/service.cpp
index edfaac4..edfaac4 100644
--- a/biometrics/fingerprint/service.cpp
+++ b/biometrics/fingerprint/2.0/service.cpp
diff --git a/biometrics/fingerprint/Android.bp b/biometrics/fingerprint/Android.bp
index 372f84e..5f8a18f 100644
--- a/biometrics/fingerprint/Android.bp
+++ b/biometrics/fingerprint/Android.bp
@@ -1,32 +1,3 @@
-//
-// Copyright (C) 2017 The Android Open Source Project
-// Copyright (C) 2017 The LineageOS 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.biometrics.fingerprint@2.0-service",
-    defaults: ["hidl_defaults"],
-    relative_install_path: "hw",
-    init_rc: ["android.hardware.biometrics.fingerprint@2.0-service.rc"],
-    srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
-    shared_libs: [
-        "libutils",
-        "liblog",
-        "libhidlbase",
-        "libhidltransport",
-        "libhardware",
-        "libhwbinder",
-        "android.hardware.biometrics.fingerprint@2.1",
-    ],
-    proprietary: true,
-}
+subdirs = [
+    "2.0",
+]