android: don't set soversion

Change-Id: Ic8056f5bf13d9706fb1671dbfbebeb03c45515c8
raspberry-vanilla · Mar 25, 2023 · f6ffa1b · f6ffa1b
1 parent a762cc5
commit f6ffa1b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/android/meson_cross.mk b/android/meson_cross.mk
@@ -236,7 +236,7 @@ $(MESON_GEN_FILES_TARGET): $(sort $(shell find -L $(LIBCAMERA_TOP) -not -path '*
 		"pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=' + '$(AOSP_ABSOLUTE_PATH)/$(MESON_GEN_DIR)', '/usr/bin/pkg-config']\n\n" \
 		"llvm-config = '/dev/null'\n"                                                                                     \
 		"[host_machine]\n"                                                                                                \
-		"system = 'linux'\n"                                                                                              \
+		"system = 'android'\n"                                                                                            \
 		"cpu_family = '$(MESON_CPU_FAMILY)'\n"                                                                            \
 		"cpu = '$(MESON_CPU_FAMILY)'\n"                                                                                   \
 		"endian = 'little'" > $(dir $@)/aosp_cross

diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build
@@ -44,6 +44,11 @@ libcamera_base_deps = [
     libunwind,
 ]
 
+if host_machine.system() == 'android'
+    libcamera_version = ''
+    libcamera_soversion = ''
+endif
+
 # Internal components must use the libcamera_base_private dependency to enable
 # the use of headers which must not be exposed to the libcamera public api.
 libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ]

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
@@ -165,6 +165,11 @@ libcamera_deps = [
     libyaml,
 ]
 
+if host_machine.system() == 'android'
+    libcamera_version = ''
+    libcamera_soversion = ''
+endif
+
 # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.
 # The build_rpath is stripped at install time by meson, so we determine at
 # runtime if the library is running from an installed location by checking