diff --git a/android/meson_cross.mk b/android/meson_cross.mk index 183e4757..e8014c17 100644 --- 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 index 7a7fd7e4..9b3486f6 100644 --- 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 index d4385041..5d0eab50 100644 --- 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