diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-21 12:44:37 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-27 12:12:00 +0100 |
| commit | 62da5fd16104c9f4db2b5b78e48269841ec98b2c (patch) | |
| tree | 90e4a5d6845264ed7afe40b4fc4e41c593f44d76 | |
| parent | 214c53a0229ff86e3c7c55046ba1216e3d0ee844 (diff) | |
| download | build-62da5fd16104c9f4db2b5b78e48269841ec98b2c.zip build-62da5fd16104c9f4db2b5b78e48269841ec98b2c.tar.gz build-62da5fd16104c9f4db2b5b78e48269841ec98b2c.tar.bz2 | |
Switch x86_64 emulator to 64 bit primary.
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.
Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
| -rw-r--r-- | CleanSpec.mk | 4 | ||||
| -rwxr-xr-x | target/board/generic_x86_64/device.mk | 3 | ||||
| -rwxr-xr-x | target/product/full_x86_64.mk | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7108e10..c64f316 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -223,6 +223,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# Switching the x86 emulator over to a 64 bit primary zygote. +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index 5b002bd..089f584 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -25,8 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ - system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ audio.primary.goldfish \ diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index d9c0c1e..cd401a8 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -23,6 +23,10 @@ # 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) |