aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2014-05-30 16:49:36 +0530
committerAmit Pundir <amit.pundir@linaro.org>2014-09-11 13:24:52 +0530
commit2f6bac63aa894c1905c04231ae1b6a6b6a72b716 (patch)
tree991fbac6b2cfe225c65535dad16b4a11628c001b
parent1feb478d28cfb427650e4cd2752bcd988b3258e6 (diff)
downloadbuild-linaro-armv8-14.09.tar.gz
build tarballs, set default runtime and zygote config in device config fileslinaro-armv8-14.09
Change-Id: I008637cea5fc30e06d8bc68687e4a6f9c706381e Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--core/Makefile1
-rw-r--r--core/main.mk4
-rw-r--r--target/product/core_minimal.mk6
3 files changed, 5 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile
index c8a28928a6..fcc43d3ad6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1604,6 +1604,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 d719b38baf..e0be7c9f9c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -711,6 +711,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 4b8b9effc4..be750f4e4a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -74,11 +74,5 @@ PRODUCT_BOOT_JARS := \
services \
apache-xml
-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)