p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge from open-source master 

Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
This commit is contained in:
The Android Open Source Project 2010-03-08 16:43:00 -08:00
parent b87e0e1d17 048683ea7e
commit 5381c1a30c
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@ -907,6 +907,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
ifneq ($(TARGET_SIMULATOR),true)
ifneq ($(TARGET_PRODUCT),sdk)
ifneq ($(TARGET_PRODUCT),generic)
ifneq ($(TARGET_PRODUCT),aosp_emulator_us)
name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
@ -936,6 +937,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
.PHONY: otapackage
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
endif # TARGET_PRODUCT != aosp_emulator_us
endif # TARGET_PRODUCT != generic
endif # TARGET_PRODUCT != sdk
endif # TARGET_SIMULATOR != true

1
core/config.mk
View File

@ -118,6 +118,7 @@ include $(BUILD_SYSTEM)/envsetup.mk
board_config_mk := \
$(strip $(wildcard \
$(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \
device/*/$(TARGET_DEVICE)/BoardConfig.mk \
vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \
))
ifeq ($(board_config_mk),)

3
core/product.mk
View File

@ -23,7 +23,8 @@
# $(call ) isn't necessary.
#
define _find-android-products-files
$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \
$(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \
$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \
$(SRC_TARGET_DIR)/product/AndroidProducts.mk
endef

1
target/product/generic.mk
View File

@ -17,6 +17,7 @@ PRODUCT_PACKAGES := \
LatinIME \
Mms \
Music \
Provision \
Settings \
Sync \
Updater \