am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master

Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
  Cherry-pick unbundled build changes from master
This commit is contained in:
Ying Wang
2010-06-02 13:11:32 -07:00
committed by Android Git Automerger
6 changed files with 83 additions and 13 deletions

View File

@@ -25,6 +25,12 @@
# it includes.
#
ifeq ($(strip $(is_unbundled_app_build)),true)
# An unbundled app build needs only generic.mk.
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
$(LOCAL_DIR)/generic.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
$(LOCAL_DIR)/generic.mk \
@@ -32,3 +38,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/full.mk \
$(LOCAL_DIR)/sdk.mk \
$(LOCAL_DIR)/sim.mk
endif