universal7904: Reorganize libshims
Change-Id: Ia33e321a9c7c19abc1a804b5d2da348e00252751
diff --git a/libshims/Android.bp b/libshims/Android.bp
deleted file mode 100644
index 2654ffb..0000000
--- a/libshims/Android.bp
+++ /dev/null
@@ -1,51 +0,0 @@
-cc_library_shared {
- name: "libshim_sensorndkbridge",
-
- srcs: ["ASensorManager.cpp"],
- shared_libs: [
- "liblog",
- "libsensorndkbridge",
- "libutils",
- ],
- whole_static_libs: ["libbase"],
- header_libs: ["libbase_headers"],
- vendor: true,
-
- include_dirs: [
- "system/core/libutils/include",
- "frameworks/hardware/interfaces/sensorservice/libsensorndkbridge",
- ],
-
-}
-
-cc_library_shared {
- name: "libcamera_metadata_helper",
- proprietary: true,
- defaults: ["hidl_defaults"],
- srcs: [
- "CameraMetadata.cpp",
- "CameraParameters.cpp",
- ],
- cflags: [
- "-Werror",
- "-Wextra",
- "-Wall",
- ],
- shared_libs: [
- "liblog",
- "libutils",
- "libhardware",
- "libcamera_metadata",
- ],
- include_dirs: ["system/media/private/camera/include"],
-}
-
-cc_library_shared {
- name: "libshim_audioparams",
- srcs: ["audioparams.cpp"],
- shared_libs: [
- "libbase",
- "libcutils",
- ],
- vendor: true,
-}
diff --git a/libshims/libaudioparams/Android.bp b/libshims/libaudioparams/Android.bp
new file mode 100644
index 0000000..edd3e0c
--- /dev/null
+++ b/libshims/libaudioparams/Android.bp
@@ -0,0 +1,15 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+ name: "libshim_audioparams",
+ srcs: ["audioparams.cpp"],
+ shared_libs: [
+ "libbase",
+ "libcutils",
+ ],
+ vendor: true,
+}
diff --git a/libshims/audioparams.cpp b/libshims/libaudioparams/audioparams.cpp
similarity index 100%
rename from libshims/audioparams.cpp
rename to libshims/libaudioparams/audioparams.cpp
diff --git a/libshims/libcamera_metadata_helper/Android.bp b/libshims/libcamera_metadata_helper/Android.bp
new file mode 100644
index 0000000..91b1ec4
--- /dev/null
+++ b/libshims/libcamera_metadata_helper/Android.bp
@@ -0,0 +1,27 @@
+//
+// Copyright (C) 2021 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+ name: "libcamera_metadata_helper",
+ proprietary: true,
+ defaults: ["hidl_defaults"],
+ srcs: [
+ "CameraMetadata.cpp",
+ "CameraParameters.cpp",
+ ],
+ cflags: [
+ "-Werror",
+ "-Wextra",
+ "-Wall",
+ ],
+ shared_libs: [
+ "liblog",
+ "libutils",
+ "libhardware",
+ "libcamera_metadata",
+ ],
+ include_dirs: ["system/media/private/camera/include"],
+}
diff --git a/libshims/CameraMetadata.cpp b/libshims/libcamera_metadata_helper/CameraMetadata.cpp
similarity index 100%
rename from libshims/CameraMetadata.cpp
rename to libshims/libcamera_metadata_helper/CameraMetadata.cpp
diff --git a/libshims/CameraMetadata.h b/libshims/libcamera_metadata_helper/CameraMetadata.h
similarity index 100%
rename from libshims/CameraMetadata.h
rename to libshims/libcamera_metadata_helper/CameraMetadata.h
diff --git a/libshims/CameraParameters.cpp b/libshims/libcamera_metadata_helper/CameraParameters.cpp
similarity index 100%
rename from libshims/CameraParameters.cpp
rename to libshims/libcamera_metadata_helper/CameraParameters.cpp
diff --git a/libshims/CameraParameters.h b/libshims/libcamera_metadata_helper/CameraParameters.h
similarity index 100%
rename from libshims/CameraParameters.h
rename to libshims/libcamera_metadata_helper/CameraParameters.h
diff --git a/libshims/ASensorManager.cpp b/libshims/sensorndkbridge/ASensorManager.cpp
similarity index 100%
rename from libshims/ASensorManager.cpp
rename to libshims/sensorndkbridge/ASensorManager.cpp
diff --git a/libshims/sensorndkbridge/Android.bp b/libshims/sensorndkbridge/Android.bp
new file mode 100644
index 0000000..1104ed3
--- /dev/null
+++ b/libshims/sensorndkbridge/Android.bp
@@ -0,0 +1,25 @@
+//
+// Copyright (C) 2021 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library_shared {
+ name: "libshim_sensorndkbridge",
+
+ srcs: ["ASensorManager.cpp"],
+ shared_libs: [
+ "liblog",
+ "libsensorndkbridge",
+ "libutils",
+ ],
+ whole_static_libs: ["libbase"],
+ header_libs: ["libbase_headers"],
+ vendor: true,
+
+ include_dirs: [
+ "system/core/libutils/include",
+ "frameworks/hardware/interfaces/sensorservice/libsensorndkbridge",
+ ],
+
+}