diff options
-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 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) |