diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-06-30 12:10:21 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-06-30 12:10:21 +0800 |
| commit | cab91300d0df2250bc80c0cba15691fe5f8172fb (patch) | |
| tree | 1c08121479a856c38f80756b1440074d41937c5d /cross | |
| parent | e2561e267fd2eb37b140a293baec79096f03290b (diff) | |
Enable caching values generated by the Android build system
* build-aux/ndk-build-helper-1.mk:
* build-aux/ndk-build-helper-2.mk:
* build-aux/ndk-build-helper.mk: Do not generate file names with
redundant directory separators, to port to systems where the
semantics of this are undefined.
* configure.ac: Provide a cache file to the recursive invocation
of configure if one is specified for the initial.
* cross/ndk-build/Makefile.in (my-dir): Better conform to the
original ndk-build by generating directory names with no
trailing separator.
* m4/ndk-build.m4 (ndk_resolve_import_module, ndk_SEARCH_MODULE):
Cache the names of Android.mk files and the commands produced
from them.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/ndk-build/Makefile.in | 2 | ||||
| -rw-r--r-- | cross/ndk-build/ndk-resolve.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cross/ndk-build/Makefile.in b/cross/ndk-build/Makefile.in index 0970a765b45..b5eac9bd089 100644 --- a/cross/ndk-build/Makefile.in +++ b/cross/ndk-build/Makefile.in @@ -79,7 +79,7 @@ local-makefile = $$(NDK_LAST_MAKEFILE) # my-dir is a function that returns the Android module directory. If # no Android.mk has been loaded, use the directory of the Makefile # being included. -my-dir = $$(or $$(and $$(local-makefile),$$(dir $$(local-makefile))),$(dir $(1))) +my-dir = $$(patsubst %/,%,$$(or $$(and $$(local-makefile),$$(dir $$(local-makefile))),$(dir $(1)))) # Return all Android.mk files under the first arg. all-makefiles-under = $$(wildcard $$(1)/*/Android.mk) diff --git a/cross/ndk-build/ndk-resolve.mk b/cross/ndk-build/ndk-resolve.mk index 896c29f7f90..289e3a8a003 100644 --- a/cross/ndk-build/ndk-resolve.mk +++ b/cross/ndk-build/ndk-resolve.mk @@ -50,7 +50,6 @@ ifeq ($$(filter $(1)$(and $(3),whole),$$(NDK_RESOLVED_CFLAGS_$(LOCAL_MODULE))),) # Always mark this module's cflags as having been resolved, even if # this is a whole library. NDK_RESOLVED_CFLAGS_$(LOCAL_MODULE) += $(1) - NDK_CFLAGS_$(LOCAL_MODULE) += $(NDK_LOCAL_EXPORT_CFLAGS_$(1)) NDK_CFLAGS_$(LOCAL_MODULE) += $(addprefix -I,$(NDK_LOCAL_EXPORT_C_INCLUDES_$(1))) endif |