resolved conflicts for merge of 2b8d2383
to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user