diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 20:49:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 20:49:20 +0000 |
| commit | 01c4f4622b3fda662bccda1ee795cf71ebbd1234 (patch) | |
| tree | 14c606022df7ed8a0f5920ba1a3a311d45930fe1 /core/definitions.mk | |
| parent | 70ae5e23fc3596c9456e88d38ad346f54e50c95c (diff) | |
| parent | dceddd91d9a6516346e752b9f942747bea931cfa (diff) | |
| download | build-01c4f4622b3fda662bccda1ee795cf71ebbd1234.zip build-01c4f4622b3fda662bccda1ee795cf71ebbd1234.tar.gz build-01c4f4622b3fda662bccda1ee795cf71ebbd1234.tar.bz2 | |
am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
Fix loophole in module expansion.
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 882c611..37a7c70 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2136,20 +2136,6 @@ define set-inherited-package-variables-internal endef ########################################################### -## Expand a module name list with REQUIRED modules -########################################################### -# $(1): The variable name that holds the initial module name list. -# the variable will be modified to hold the expanded results. -# $(2): The initial module name list. -# Returns empty string (maybe with some whitespaces). -define expand-required-modules -$(eval _erm_new_modules := $(sort $(filter-out $($(1)),\ - $(foreach m,$(2),$(ALL_MODULES.$(m).REQUIRED)))))\ -$(if $(_erm_new_modules),$(eval $(1) += $(_erm_new_modules))\ - $(call expand-required-modules,$(1),$(_erm_new_modules))) -endef - -########################################################### ## API Check ########################################################### |