diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-17 10:05:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 10:05:13 +0000 |
| commit | b60ccd667200d34808f253bdf8d56ea18834006b (patch) | |
| tree | 1c5e098886499fd368a882f9456ddd91a4300e6a | |
| parent | 5c1d21b458880bcc466bc353bc9afbef8e439afc (diff) | |
| parent | ae65e2eb8d5f530d4292a5c70bac113f18900e9d (diff) | |
| download | build-b60ccd667200d34808f253bdf8d56ea18834006b.zip build-b60ccd667200d34808f253bdf8d56ea18834006b.tar.gz build-b60ccd667200d34808f253bdf8d56ea18834006b.tar.bz2 | |
am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
Make default 64-bit primary, 32-bit secondary
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | target/product/core_64_bit.mk | 8 | ||||
| -rwxr-xr-x | target/product/full_x86_64.mk | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 4664d3c..a9fea3e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -250,6 +250,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # Switching to 32-bit-by-default host multilib build $(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES)) +# Change ro.zygote for core_64_bit.mk from zygote32_64 to zygote64_32 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/config.mk b/core/config.mk index 5982ff4..65370ab 100644 --- a/core/config.mk +++ b/core/config.mk @@ -255,7 +255,7 @@ endif # # Note that this assumes that the 2ND_CPU_ABI for a 64 bit target # is always 32 bits. If this isn't the case, these variables should -# be overriden in the boarc configuration. +# be overriden in the board configuration. ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT)) ifeq (true|true,$(TARGET_IS_64_BIT)|$(TARGET_SUPPORTS_64_BIT_APPS)) TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 971b6bd..76e2a36 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -22,12 +22,12 @@ # For now this will allow 64-bit apps, but still compile all apps with JNI # for 32-bit only. -# Copy the 32-bit primary, 64-bit secondary zygote startup script -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc +# Copy the 64-bit primary, 32-bit secondary zygote startup script +PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc -# Set the zygote property to select the 32-bit primary, 64-bit secondary script +# Set the zygote property to select the 64-bit primary, 32-bit secondary script # This line must be parsed before the one in core_minimal.mk -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_64_BIT_APPS := true diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index cd401a8..d9c0c1e 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -23,10 +23,6 @@ # that isn't a wifi connection. This will instruct init.rc to enable the # network connection so that you can use it with ADB -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc - - $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) |