diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-08 16:43:00 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-08 16:43:00 -0800 |
| commit | 5381c1a30c77a2e9209fd91f23110429a71826fd (patch) | |
| tree | c62185323eb48b056a4d103e0d42247d8b2fb5a1 | |
| parent | b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2 (diff) | |
| parent | 048683ea7e2d21dc681917d1b0eab7a24df79eaf (diff) | |
| download | build-5381c1a30c77a2e9209fd91f23110429a71826fd.zip build-5381c1a30c77a2e9209fd91f23110429a71826fd.tar.gz build-5381c1a30c77a2e9209fd91f23110429a71826fd.tar.bz2 | |
merge from open-source master
Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/config.mk | 1 | ||||
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | target/product/generic.mk | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 2f316ca..46f5311 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 diff --git a/core/config.mk b/core/config.mk index e574124..4662a38 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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),) diff --git a/core/product.mk b/core/product.mk index a9a24d2..5417242 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 diff --git a/target/product/generic.mk b/target/product/generic.mk index b4b1b09..8c85ca6 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -17,6 +17,7 @@ PRODUCT_PACKAGES := \ LatinIME \ Mms \ Music \ + Provision \ Settings \ Sync \ Updater \ |