diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-08-06 20:41:20 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2015-08-06 20:41:20 -0700 |
commit | 7856df5d50386b5d6d5e6c9a2d762686ae2fa24e (patch) | |
tree | ccc6de014aa62c052ea286aed4f53558d79be493 | |
parent | 53b5e80f3deffc6134f6b2582746b3474d0cffd1 (diff) | |
download | platform_external_iptables-7856df5d50386b5d6d5e6c9a2d762686ae2fa24e.tar.gz platform_external_iptables-7856df5d50386b5d6d5e6c9a2d762686ae2fa24e.tar.bz2 platform_external_iptables-7856df5d50386b5d6d5e6c9a2d762686ae2fa24e.zip |
build: wildcard isn't guaranteed to be sorted
To prevent this from changing between builds, wrap in $(sort )
Change-Id: Ib7758346c9d5a6752bca6d547ccdd5ce7344fb49
-rw-r--r-- | extensions/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/Android.mk b/extensions/Android.mk index 0dd34523..2f949016 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -6,9 +6,9 @@ MY_srcdir:=$(LOCAL_PATH) # Exclude some modules that are problematic to compile (types/header). MY_excluded_modules:=TCPOPTSTRIP connlabel -MY_pfx_build_mod := $(patsubst ${MY_srcdir}/libxt_%.c,%,$(wildcard ${MY_srcdir}/libxt_*.c)) -MY_pf4_build_mod := $(patsubst ${MY_srcdir}/libipt_%.c,%,$(wildcard ${MY_srcdir}/libipt_*.c)) -MY_pf6_build_mod := $(patsubst ${MY_srcdir}/libip6t_%.c,%,$(wildcard ${MY_srcdir}/libip6t_*.c)) +MY_pfx_build_mod := $(patsubst ${MY_srcdir}/libxt_%.c,%,$(sort $(wildcard ${MY_srcdir}/libxt_*.c))) +MY_pf4_build_mod := $(patsubst ${MY_srcdir}/libipt_%.c,%,$(sort $(wildcard ${MY_srcdir}/libipt_*.c))) +MY_pf6_build_mod := $(patsubst ${MY_srcdir}/libip6t_%.c,%,$(sort $(wildcard ${MY_srcdir}/libip6t_*.c))) MY_pfx_build_mod := $(filter-out ${MY_excluded_modules} dccp ipvs,${MY_pfx_build_mod}) MY_pf4_build_mod := $(filter-out ${MY_excluded_modules} dccp ipvs,${MY_pf4_build_mod}) MY_pf6_build_mod := $(filter-out ${MY_excluded_modules} dccp ipvs,${MY_pf6_build_mod}) |