diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-12 00:34:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 00:34:44 +0000 |
| commit | a2981544ac2f64fcf942881362057bf81e9a195e (patch) | |
| tree | ccc6de014aa62c052ea286aed4f53558d79be493 | |
| parent | a41cf02b99cfc7fc6f577d79a746424239de2cf6 (diff) | |
| parent | 592f0b0cbfc7d9c6e88c00d963e9cad5a8e7374f (diff) | |
| download | platform_external_iptables-a2981544ac2f64fcf942881362057bf81e9a195e.tar.gz platform_external_iptables-a2981544ac2f64fcf942881362057bf81e9a195e.tar.bz2 platform_external_iptables-a2981544ac2f64fcf942881362057bf81e9a195e.zip | |
am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted"
* commit '592f0b0cbfc7d9c6e88c00d963e9cad5a8e7374f':
build: wildcard isn't guaranteed to be sorted
| -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}) |