diff options
| author | Ying Wang <wangying@google.com> | 2010-06-15 15:11:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-06-15 15:11:51 -0700 |
| commit | c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6 (patch) | |
| tree | 6b3021fcae21fed17f4fc85c4a28044d74d2999b /target/product/AndroidProducts.mk | |
| parent | 71affe70fd8f882c7c9cc7a5aca28e714241eb6e (diff) | |
| parent | 2b8d2383043a2b16e53538f9ebf123bfffd27ba1 (diff) | |
| download | build-c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6.zip build-c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6.tar.gz build-c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6.tar.bz2 | |
resolved conflicts for merge of 2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
Diffstat (limited to 'target/product/AndroidProducts.mk')
| -rw-r--r-- | target/product/AndroidProducts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index df2fca1..9a91da9 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -25,8 +25,8 @@ # it includes. # -ifeq ($(strip $(is_unbundled_app_build)),true) # An unbundled app build needs only generic.mk. +ifneq ($(TARGET_BUILD_APPS),) PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ $(LOCAL_DIR)/generic.mk |