p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp 

Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
This commit is contained in:
Brian Carlstrom 2014-05-29 14:01:24 -07:00
parent 834ec0ead5 2267c22b3d
commit 8fe9c76d9a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@ -244,6 +244,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
# Rename persist.sys.dalvik.vm.lib.1 to allow new default
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# Switching PRODUCT_RUNTIMES default for some devices
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

3
target/product/core_minimal.mk
View File

@ -79,8 +79,7 @@ PRODUCT_BOOT_JARS := \
apache-xml \
webviewchromium
PRODUCT_RUNTIMES := runtime_libdvm_default
PRODUCT_RUNTIMES += runtime_libart
PRODUCT_RUNTIMES := runtime_libart_default
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32