diff options
| author | Colin Cross <ccross@android.com> | 2014-01-27 16:30:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-01-28 22:13:15 +0000 |
| commit | 84d100d6119fd4df196c0e121d8f7ffe4c2076e1 (patch) | |
| tree | fde0cd7d47924760a66dc041470e4ba59592f596 | |
| parent | f58ab5b858e93512a9a8335920c63c6a2c834931 (diff) | |
| download | iptables-84d100d6119fd4df196c0e121d8f7ffe4c2076e1.tar.gz | |
external/iptables: use local-generated-sources-dir
local-intermediates-dir doesn't work for multiarch builds, because
each architecture needs a separate intermediates dir. Use
local-generated-sources-dir, which gives a directory under $OUT/gen
that can be shared by both architectures. Files installed into
$OUT/gen/*/*_intermediates and listed in LOCAL_GENERATED_SOURCES
will be copied into $OUT/obj*/*/*_intermediates automatically as
necessary.
(cherry picked from commit b4ad8a418b48b6a7df8f88a276c52f00c1bb43af)
Change-Id: I35ed4bc51e694ca4dc8343bc59977f1daeae3abc
| -rw-r--r-- | extensions/libext.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/libext.mk b/extensions/libext.mk index 51efd472..1255ed0c 100644 --- a/extensions/libext.mk +++ b/extensions/libext.mk @@ -3,15 +3,15 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS:= LOCAL_MODULE:=libext$(libext_suffix) -# LOCAL_MODULE_CLASS must be defined before calling $(local-intermediates-dir) +# LOCAL_MODULE_CLASS must be defined before calling $(local-generated-sources-dir) # LOCAL_MODULE_CLASS := STATIC_LIBRARIES -MY_intermediates := $(call local-intermediates-dir) +MY_gen := $(call local-generated-sources-dir) # LOCAL_PATH needed because of dirty #include "blabla.c" LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../include/ \ - $(MY_intermediates) \ + $(MY_gen) \ $(LOCAL_PATH) LOCAL_CFLAGS:=-DNO_SHARED_LIBS=1 @@ -22,7 +22,7 @@ LOCAL_CFLAGS+=-DXTABLES_INTERNAL LOCAL_CFLAGS+=-D__ANDROID__ LOCAL_CFLAGS += $(MY_warnings) -MY_GEN_INITEXT:= $(MY_intermediates)/initext.c +MY_GEN_INITEXT:= $(MY_gen)/initext.c $(MY_GEN_INITEXT): MY_initext_func := $(addprefix $(libext_prefix)_,$(libext_build_mod)) $(MY_GEN_INITEXT): MY_suffix := $(libext_suffix) $(MY_GEN_INITEXT): @@ -44,16 +44,16 @@ $(MY_GEN_INITEXT): MY_lib_sources:= \ $(patsubst %,$(LOCAL_PATH)/lib$(libext_prefix)_%.c,$(libext_build_mod)) -MY_gen_lib_sources:= $(patsubst $(LOCAL_PATH)/%,${MY_intermediates}/%,${MY_lib_sources}) +MY_gen_lib_sources:= $(patsubst $(LOCAL_PATH)/%,${MY_gen}/%,${MY_lib_sources}) ${MY_gen_lib_sources}: PRIVATE_PATH := $(LOCAL_PATH) ${MY_gen_lib_sources}: PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/filter_init $(PRIVATE_PATH)/$(notdir $@) > $@ ${MY_gen_lib_sources}: PRIVATE_MODULE := $(LOCAL_MODULE) ${MY_gen_lib_sources}: PRIVATE_C_INCLUDES := $(LOCAL_C_INCLUDES) -${MY_gen_lib_sources}: $(MY_lib_sources) +${MY_gen_lib_sources}: ${MY_gen}/% : $(LOCAL_PATH)/% $(transform-generated-source) -$(MY_intermediates)/initext$(libext_suffix).o : $(MY_GEN_INITEXT) $(MY_gen_lib_sources) +$(MY_GEN_INITEXT): $(MY_gen_lib_sources) LOCAL_GENERATED_SOURCES:= $(MY_GEN_INITEXT) $(MY_gen_lib_sources) |