diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-01-24 19:10:58 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-01-24 19:10:58 +0800 |
| commit | 54836c47c76f655a7e3d6cf28f0cf27b8d9f3cdd (patch) | |
| tree | 0ac362c622f571a738593afff8f1a8fbaadaac46 /build-aux/ndk-build-helper-2.mk | |
| parent | 56e55a80080f78754db6f385d574d17c3631ee30 (diff) | |
| download | emacs-54836c47c76f655a7e3d6cf28f0cf27b8d9f3cdd.tar.gz | |
Enable libjpeg on Android
* INSTALL.android: Update documentation.
* build-aux/ndk-build-helper-1.mk: When building shared
libraries, do not link libemacs.so with dependent archive files.
* build-aux/ndk-build-helper-2.mk: Add whole archive
dependencies as well.
* configure.ac (HAVE_JPEG): Enable on Android.
* cross/ndk-build/ndk-build-shared-library.mk: Link the shared
object with archive file dependencies.
* cross/ndk-build/ndk-build-static-library.mk: Build all code
position-independently.
* cross/ndk-build/ndk-resolve.mk: Separately resolve a names of
archive and whole archive dependencies.
* src/Makefile.in (JPEG_CFLAGS): New variable.
(EMACS_CFLAGS): Add it.
Diffstat (limited to 'build-aux/ndk-build-helper-2.mk')
| -rw-r--r-- | build-aux/ndk-build-helper-2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/ndk-build-helper-2.mk b/build-aux/ndk-build-helper-2.mk index 82c1d53c7d0..bd50e8b3efa 100644 --- a/build-aux/ndk-build-helper-2.mk +++ b/build-aux/ndk-build-helper-2.mk @@ -79,7 +79,7 @@ endef SYSTEM_LIBRARIES = z libz -$(foreach module,$(filter-out $(SYSTEM_LIBRARIES), $(LOCAL_STATIC_LIBRARIES)),$(eval $(call add-a-name,$(module)))) +$(foreach module,$(filter-out $(SYSTEM_LIBRARIES), $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)),$(eval $(call add-a-name,$(module)))) $(foreach module,$(filter-out $(SYSTEM_LIBRARIES), $(LOCAL_SHARED_LIBRARIES)),$(eval $(call add-so-name,$(module)))) $(info $(LOCAL_EXPORT_LDFLAGS) $(abspath $(addprefix $(NDK_BUILD_DIR)/,$(NDK_A_NAMES))) $(and $(NDK_SO_NAMES), -L$(abspath $(NDK_BUILD_DIR)) $(foreach soname,$(NDK_SO_NAMES),-l:$(soname)))) |