Convert libcamera_client to Android.bp
See build/soong/README.md for more information
Test: m -j checkbuild
Change-Id: Ie3a82e929ea1e2c271e362bf0fa85f79fa9e9004
diff --git a/Android.bp b/Android.bp
index 53f8bec..cba745f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,6 @@
}
subdirs = [
- "camera/ndk",
+ "camera",
"media/*",
]
diff --git a/camera/Android.bp b/camera/Android.bp
new file mode 100644
index 0000000..7ff3e89
--- /dev/null
+++ b/camera/Android.bp
@@ -0,0 +1,78 @@
+// Copyright 2010 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.
+
+subdirs = ["ndk"]
+
+cc_library_shared {
+ name: "libcamera_client",
+
+ aidl: {
+ export_aidl_headers: true,
+ local_include_dirs: ["aidl"],
+ include_dirs: [
+ "frameworks/base/core/java",
+ "frameworks/native/aidl/gui",
+ ],
+ },
+
+ srcs: [
+ // AIDL files for camera interfaces
+ // The headers for these interfaces will be available to any modules that
+ // include libcamera_client, at the path "aidl/package/path/BnFoo.h"
+ "aidl/android/hardware/ICameraService.aidl",
+ "aidl/android/hardware/ICameraServiceListener.aidl",
+ "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",
+ "aidl/android/hardware/camera2/ICameraDeviceUser.aidl",
+
+ // Source for camera interface parcelables, and manually-written interfaces
+ "Camera.cpp",
+ "CameraMetadata.cpp",
+ "CameraParameters.cpp",
+ "CaptureResult.cpp",
+ "CameraParameters2.cpp",
+ "ICamera.cpp",
+ "ICameraClient.cpp",
+ "ICameraServiceProxy.cpp",
+ "ICameraRecordingProxy.cpp",
+ "ICameraRecordingProxyListener.cpp",
+ "camera2/CaptureRequest.cpp",
+ "camera2/OutputConfiguration.cpp",
+ "camera2/SubmitInfo.cpp",
+ "CameraBase.cpp",
+ "CameraUtils.cpp",
+ "VendorTagDescriptor.cpp",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libbinder",
+ "libgui",
+ "libcamera_metadata",
+ ],
+
+ include_dirs: [
+ "system/media/private/camera/include",
+ "frameworks/native/include/media/openmax",
+ ],
+ export_include_dirs: ["include/camera"],
+ export_shared_lib_headers: ["libcamera_metadata"],
+
+ cflags: [
+ "-Werror",
+ "-Wall",
+ "-Wextra",
+ ],
+}
diff --git a/camera/Android.mk b/camera/Android.mk
index 91d87ed..d9068c0 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -12,67 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CAMERA_CLIENT_LOCAL_PATH:= $(call my-dir)
include $(call all-subdir-makefiles)
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(CAMERA_CLIENT_LOCAL_PATH)
-
-LOCAL_AIDL_INCLUDES := \
- frameworks/av/camera/aidl \
- frameworks/base/core/java \
- frameworks/native/aidl/gui
-
-# AIDL files for camera interfaces
-# The headers for these interfaces will be available to any modules that
-# include libcamera_client, at the path "aidl/package/path/BnFoo.h"
-
-LOCAL_SRC_FILES := \
- aidl/android/hardware/ICameraService.aidl \
- aidl/android/hardware/ICameraServiceListener.aidl \
- aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl \
- aidl/android/hardware/camera2/ICameraDeviceUser.aidl
-
-# Source for camera interface parcelables, and manually-written interfaces
-
-LOCAL_SRC_FILES += \
- Camera.cpp \
- CameraMetadata.cpp \
- CameraParameters.cpp \
- CaptureResult.cpp \
- CameraParameters2.cpp \
- ICamera.cpp \
- ICameraClient.cpp \
- ICameraServiceProxy.cpp \
- ICameraRecordingProxy.cpp \
- ICameraRecordingProxyListener.cpp \
- camera2/CaptureRequest.cpp \
- camera2/OutputConfiguration.cpp \
- camera2/SubmitInfo.cpp \
- CameraBase.cpp \
- CameraUtils.cpp \
- VendorTagDescriptor.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libutils \
- liblog \
- libbinder \
- libgui \
- libcamera_metadata \
-
-LOCAL_C_INCLUDES += \
- system/media/camera/include \
- system/media/private/camera/include \
- frameworks/native/include/media/openmax \
- $(LOCAL_PATH)/include/camera
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- system/media/camera/include \
- $(LOCAL_PATH)/include/camera
-
-LOCAL_CFLAGS += -Werror -Wall -Wextra
-
-LOCAL_MODULE:= libcamera_client
-
-include $(BUILD_SHARED_LIBRARY)
