diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-05-30 16:49:36 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-10-07 09:58:36 +0530 |
| commit | 76fd6e422dae7101daa204542fc06f7728cb6e51 (patch) | |
| tree | 0d5f4c134ad0cedef9ef6794332ae80127922fac | |
| parent | 642c81ea4559836236a38123feec3d8e51d4b9c2 (diff) | |
| download | build-76fd6e422dae7101daa204542fc06f7728cb6e51.tar.gz | |
build tarballs, set default runtime and zygote config in device config files
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 | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile index 6fcd394315..8aa07d1963 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 1958a16748..f9203935a7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -710,6 +710,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) |