Android.bp: add vendor_available to IPA and camera static lib deps
The ninja-to-soong migration marked all libcamera shared libs as soc_specific: true but omitted vendor_available: true from the static libs they link against. This causes Soong to fail with "missing variant: image:vendor" when the static libs are pulled in transitively by the vendor APEX com.android.hardware.camera.libcamera. Add vendor_available: true to the five affected cc_library_static modules.
This commit is contained in:
@@ -172,6 +172,7 @@ cc_library_shared {
|
||||
|
||||
cc_library_static {
|
||||
name: "libcamera-rpi_src_ipa_rpi_controller_librpi_ipa_controller_a",
|
||||
vendor_available: true,
|
||||
srcs: [
|
||||
"src/ipa/rpi/controller/*.cpp",
|
||||
"src/ipa/rpi/controller/rpi/af.cpp",
|
||||
@@ -217,6 +218,7 @@ cc_library_static {
|
||||
|
||||
cc_library_static {
|
||||
name: "libcamera-rpi_src_ipa_rpi_common_librpi_ipa_common_a",
|
||||
vendor_available: true,
|
||||
srcs: ["src/ipa/rpi/common/ipa_base.cpp"],
|
||||
cflags: [
|
||||
"-DLIBCAMERA_BASE_PRIVATE",
|
||||
@@ -239,6 +241,7 @@ cc_library_static {
|
||||
|
||||
cc_library_static {
|
||||
name: "libcamera-rpi_src_ipa_rpi_cam_helper_librpi_ipa_cam_helper_a",
|
||||
vendor_available: true,
|
||||
srcs: [
|
||||
"src/ipa/rpi/cam_helper/*.cpp",
|
||||
"src/ipa/rpi/cam_helper/imx500_tensor_parser/imx500_tensor_parser.cpp",
|
||||
@@ -264,6 +267,7 @@ cc_library_static {
|
||||
|
||||
cc_library_static {
|
||||
name: "libcamera-rpi_src_ipa_libipa_libipa_a",
|
||||
vendor_available: true,
|
||||
srcs: ["src/ipa/libipa/*.cpp"],
|
||||
cflags: [
|
||||
"-DLIBCAMERA_BASE_PRIVATE",
|
||||
@@ -370,6 +374,7 @@ cc_library_shared {
|
||||
|
||||
cc_library_static {
|
||||
name: "libcamera-rpi_src_android_libcamera_metadata_a",
|
||||
vendor_available: true,
|
||||
srcs: ["src/android/metadata/camera_metadata.c"],
|
||||
cflags: ["-Wno-shadow"],
|
||||
local_include_dirs: [
|
||||
|
||||
Reference in New Issue
Block a user