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-07-14 13:59:10 +0530
commitd7803ba6f7edb13240a89930a03367ac54e80784 (patch)
tree5aba150ae128b22b2918616e7d8c4c6b8d54646d
parent6ff849568c94c53c8a722f71f33c1e688ebbed74 (diff)
downloadbuild-linaro-armv8-14.07.tar.gz
build tarballs, set default runtime and zygote config in device config fileslinaro-armv8-14.07
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.mk7
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 c65fe3ccbc..cd02db36e8 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 ec51ea4ec2..31b870ba3a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -74,11 +74,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)