StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 56791ebe to master

Browse Source 
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
This commit is contained in:
Ying Wang
2010-06-15 15:43:13 -07:00
parent 8004266329 56791ebe26
commit f9cd36a0f7
8 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/AndroidProducts.mk
View File

@@ -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