diff options
| author | Android Git Automerger <android-git-automerger@android.com> | 2011-10-11 10:10:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-11 10:10:35 -0700 |
| commit | 861348a4be2355e49f090271d7410fa850d5c7f8 (patch) | |
| tree | bf7d7f3d082fa95961693ae9f2ac939314b65924 /core | |
| parent | 738f053bf3e00af8455d89dd4bb4724e83292e7e (diff) | |
| parent | e27347e7a4e41e250b689d54ae911522623b2427 (diff) | |
| download | build-861348a4be2355e49f090271d7410fa850d5c7f8.zip build-861348a4be2355e49f090271d7410fa850d5c7f8.tar.gz build-861348a4be2355e49f090271d7410fa850d5c7f8.tar.bz2 | |
Merge branch 'master' of ssh://android-git:29418/platform/build
Diffstat (limited to 'core')
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/main.mk b/core/main.mk index 6841b36..5f01238 100644 --- a/core/main.mk +++ b/core/main.mk @@ -664,6 +664,11 @@ ifdef is_sdk_build $(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d))) modules_to_install := \ $(filter-out $(target_gnu_MODULES),$(modules_to_install)) + + # Ensure every module listed in PRODUCT_PACKAGES gets something installed + $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ + $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ + $(error Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) endif diff --git a/core/product.mk b/core/product.mk index 72cb2f7..8b76243 100644 --- a/core/product.mk +++ b/core/product.mk @@ -76,7 +76,6 @@ _product_var_list := \ PRODUCT_EXTRA_RECOVERY_KEYS \ PRODUCT_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \ - PRODUCT_CONTRIBUTORS_FILE \ PRODUCT_TAGS \ PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_COPY_FILES \ diff --git a/core/product_config.mk b/core/product_config.mk index e673d5c..23e06ea 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -282,10 +282,6 @@ endif PRODUCT_COPY_FILES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) -# The HTML file containing the contributors to the project. -PRODUCT_CONTRIBUTORS_FILE := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) - # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. PRODUCT_PROPERTY_OVERRIDES := \ |