diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-22 21:20:30 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-22 21:20:30 +0800 |
| commit | 767da53fa3a15ed448c14aa4dc468f187a6e2df9 (patch) | |
| tree | 2fc5be35e15985a9f62ed68431199c87d920b21f /build-aux | |
| parent | f3b6cbb6755a1c1587b8a6c3165732c5f0187397 (diff) | |
| download | emacs-767da53fa3a15ed448c14aa4dc468f187a6e2df9.tar.gz | |
Update Android port
ImageMagick now builds but does not link yet some of the time.
* INSTALL.android: Document ImageMagick and caveats.
* build-aux/ndk-build-helper-1.mk (NDK_SO_NAMES):
* build-aux/ndk-build-helper-2.mk (NDK_A_NAMES):
* build-aux/ndk-build-helper.mk (TARGET_ARCH_ABI): Define architecture
and don't respect explicitly specified library names.
* configure.ac: Enable ImageMagick and lcms2 on Android.
* cross/ndk-build/ndk-build-shared-library.mk (objname)::($(call
objname,$(LOCAL_MODULE),$(basename
$(1))))::(ALL_OBJECT_FILES$(LOCAL_MODULE)):
* cross/ndk-build/ndk-build-static-library.mk (objname)::($(call
objname,$(LOCAL_MODULE),$(basename $(1)))):
(NDK_CFLAGS, ALL_SOURCE_FILES): Handle sources files which start with
$(LOCAL_PATH).
* cross/ndk-build/ndk-clear-vars.mk: Don't undefine; clear variables
instead.
* m4/ndk-build.m4 (ndk_SEARCH_MODULE): Redirect make stderr to
config.log.xf64
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/ndk-build-helper-1.mk | 4 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper-2.mk | 5 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper.mk | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/build-aux/ndk-build-helper-1.mk b/build-aux/ndk-build-helper-1.mk index 898edf3a137..04acecb5b29 100644 --- a/build-aux/ndk-build-helper-1.mk +++ b/build-aux/ndk-build-helper-1.mk @@ -36,15 +36,11 @@ $(info Building $(build_kind)) $(info $(LOCAL_MODULE)) $(info $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI)))) -ifeq ($(LOCAL_MODULE_FILENAME),) ifeq ($(findstring lib,$(LOCAL_MODULE)),lib) NDK_SO_NAMES = $(LOCAL_MODULE)_emacs.so else NDK_SO_NAMES = lib$(LOCAL_MODULE)_emacs.so endif -else -NDK_SO_NAMES = $(LOCAL_MODULE_FILENAME).so -endif define add-so-name-1 # Now recurse over this module's dependencies. diff --git a/build-aux/ndk-build-helper-2.mk b/build-aux/ndk-build-helper-2.mk index 6be7f268fe7..59f77106784 100644 --- a/build-aux/ndk-build-helper-2.mk +++ b/build-aux/ndk-build-helper-2.mk @@ -30,16 +30,11 @@ $(info Building $(build_kind)) $(info $(LOCAL_MODULE)) $(info $(addprefix $(LOCAL_PATH)/,$(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES$(EMACS_ABI)))) -ifeq ($(LOCAL_MODULE_FILENAME),) - ifeq ($(findstring lib,$(LOCAL_MODULE)),lib) NDK_A_NAMES = $(LOCAL_MODULE).a else NDK_A_NAMES = lib$(LOCAL_MODULE).a endif -else -NDK_A_NAMES = $(LOCAL_MODULE_FILENAME).a -endif define add-a-name ifeq ($(findstring lib,$(1)),lib) diff --git a/build-aux/ndk-build-helper.mk b/build-aux/ndk-build-helper.mk index 886459b1378..fe8a6a5119c 100644 --- a/build-aux/ndk-build-helper.mk +++ b/build-aux/ndk-build-helper.mk @@ -21,6 +21,9 @@ # See the text under ``NDK BUILD SYSTEM IMPLEMENTATION'' in # INSTALL.android for more details. +# TARGET_ARCH_ABI is the ABI that is being built for. +TARGET_ARCH_ABI := $(EMACS_ABI) + # NDK_LAST_MAKEFILE is the last Makefile that was included. NDK_LAST_MAKEFILE = $(lastword $(filter %Android.mk,$(MAKEFILE_LIST))) |