tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of e67944ee to master

Browse source 
Change-Id: I9284d5a5df6fc963bc4c70c87a505857f41c93af
This commit is contained in:
Ying Wang 2010-10-22 14:41:17 -07:00
commit 663c9f2d59
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/product/AndroidProducts.mk
View file

@ -25,11 +25,12 @@
# it includes.
#
# An unbundled app build needs only generic.mk.
# Unbundled apps will be built with the default product config.
ifneq ($(TARGET_BUILD_APPS),)
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
$(LOCAL_DIR)/generic.mk
$(LOCAL_DIR)/generic.mk \
$(LOCAL_DIR)/full.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \

2
target/product/full_no_telephony.mk
View file

@ -39,7 +39,7 @@ PRODUCT_COPY_FILES := \
PRODUCT_LOCALES := en_US
# Pick up some sounds.
$(call inherit-product, frameworks/base/data/sounds/AudioPackage4.mk)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage4.mk)
# Get a list of languages.
$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)