diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-01-29 11:21:07 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-01-29 11:21:07 +0800 |
| commit | 492aa74b13bb2c9d5a751d043fed2ef9e9365781 (patch) | |
| tree | 7cbece4e23483e52fe8bdb05cce8b67f9d133cff /cross | |
| parent | f9e32ce1575da69cc3a9e4690b6df2dbee41d14d (diff) | |
| download | emacs-492aa74b13bb2c9d5a751d043fed2ef9e9365781.tar.gz | |
Update Android port
* INSTALL.android (module_target): Clarify documentation.
* cross/ndk-build/ndk-build-shared-library.mk:
* cross/ndk-build/ndk-build-static-library.mk: Fix building Neon objects.
* java/AndroidManifest.xml.in: Add a version code.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/ndk-build/ndk-build-shared-library.mk | 11 | ||||
| -rw-r--r-- | cross/ndk-build/ndk-build-static-library.mk | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/cross/ndk-build/ndk-build-shared-library.mk b/cross/ndk-build/ndk-build-shared-library.mk index f169e89d058..a63bf90b042 100644 --- a/cross/ndk-build/ndk-build-shared-library.mk +++ b/cross/ndk-build/ndk-build-shared-library.mk @@ -50,7 +50,7 @@ $(call objname,$(LOCAL_MODULE),$(basename $(1))): $(LOCAL_PATH)/$(1) $(NDK_BUILD_CC) -c $$< -o $$@ $(NDK_ASFLAGS_$(LOCAL_MODULE)) else -ifneq (x$(suffix $(1)),x.asm) +ifneq (x.$(suffix $(1)),x.asm) $$(error Unsupported suffix: $(suffix $(1))) else ifneq (x$(LOCAL_ASM_RULE_DEFINED),x) @@ -124,10 +124,15 @@ LOCAL_MODULE_FILENAME := $(LOCAL_MODULE_FILENAME).so include ndk-resolve.mk # Then define rules to build all objects. -ALL_SOURCE_FILES = $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) +ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) # This defines all dependencies. -ALL_OBJECT_FILES$(LOCAL_MODULE) = +ALL_OBJECT_FILES$(LOCAL_MODULE) := + +# Now filter out code that is only built on systems with neon. +ifeq ($(NDK_BUILD_ABI),armeabi-v7a) +ALL_SOURCE_FILES := $(filter-out %.neon,$(ALL_SOURCE_FILES)) +endif $(foreach source,$(ALL_SOURCE_FILES),$(eval $(call single-object-target,$(source)))) diff --git a/cross/ndk-build/ndk-build-static-library.mk b/cross/ndk-build/ndk-build-static-library.mk index d5a8e93800d..e6e2d2810fb 100644 --- a/cross/ndk-build/ndk-build-static-library.mk +++ b/cross/ndk-build/ndk-build-static-library.mk @@ -42,7 +42,7 @@ $(call objname,$(LOCAL_MODULE),$(basename $(1))): $(LOCAL_PATH)/$(1) $(NDK_BUILD_CC) -c $$< -o $$@ $(NDK_ASFLAGS_$(LOCAL_MODULE)) else -ifneq (x$(suffix $(1)),x.asm) +ifneq (x.$(suffix $(1)),x.asm) $$(error Unsupported suffix: $(suffix $(1))) else ifneq (x$(LOCAL_ASM_RULE_DEFINED),x) @@ -113,7 +113,12 @@ LOCAL_MODULE_FILENAME := $(LOCAL_MODULE_FILENAME).a include ndk-resolve.mk # Then define rules to build all objects. -ALL_SOURCE_FILES = $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) +ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) + +# Now filter out code that is only built on systems with neon. +ifeq ($(NDK_BUILD_ABI),armeabi-v7a) +ALL_SOURCE_FILES := $(filter-out %.neon,$(ALL_SOURCE_FILES)) +endif # This defines all dependencies. ALL_OBJECT_FILES$(LOCAL_MODULE) = |