diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-05-30 16:49:36 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-07-31 16:21:37 +0530 |
| commit | 0b9e53bad5a05b2cc5bf85e1fcb8d4778589c2b5 (patch) | |
| tree | 2f96a0f658f3aa90ab8070cd63f30a25a0d08b2c | |
| parent | d23798bfdc9bb34909177c3c5f06f0c97cc9897e (diff) | |
| download | build-armv8-linaro-master-july29.tar.gz | |
build tarballs, set default runtime and zygote config in device config filesarmv8-linaro-master-july29
Change-Id: I008637cea5fc30e06d8bc68687e4a6f9c706381e
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/main.mk | 4 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index 853bd447a1..3841b43414 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1610,6 +1610,7 @@ ifneq ($(dont_bother),true) include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk)) -include $(sort $(wildcard vendor/*/build/tasks/*.mk)) -include $(sort $(wildcard device/*/build/tasks/*.mk)) +-include $(sort $(wildcard device/*/common/tasks/*.mk)) endif # ----------------------------------------------------------------- diff --git a/core/main.mk b/core/main.mk index be2b30059f..662b7b127e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -706,6 +706,10 @@ ifdef FULL_BUILD $(foreach p,$(product_FILES),$(info : $(p))) $(error done) endif + ifneq ($(TARGET_BOOTLOADER_TYPE),fastboot) + # We need (host) fs_get_stats for the boottarball target + subdirs += build/tools/fs_get_stats + endif else # We're not doing a full build, and are probably only including # a subset of the module makefiles. Don't try to build any modules diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index b1d6546634..d9d3c1c494 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -75,11 +75,4 @@ PRODUCT_BOOT_JARS := \ apache-xml \ webviewchromium -PRODUCT_RUNTIMES := runtime_libart_default - -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.zygote=zygote32 -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc - $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) |