diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-27 11:15:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-27 11:15:57 +0000 |
| commit | 6c2ae327665396958ba6f08dc72bc30b3455d046 (patch) | |
| tree | 5b237fe75eabde633cb4b0c3384b74fddbeda4dc /target | |
| parent | 0f99bb3d0bb358e79be85b54823792ec2c198b8b (diff) | |
| parent | 8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3 (diff) | |
| download | build-6c2ae327665396958ba6f08dc72bc30b3455d046.zip build-6c2ae327665396958ba6f08dc72bc30b3455d046.tar.gz build-6c2ae327665396958ba6f08dc72bc30b3455d046.tar.bz2 | |
am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
Diffstat (limited to 'target')
| -rwxr-xr-x | target/board/generic_x86_64/device.mk | 3 | ||||
| -rwxr-xr-x | target/product/full_x86_64.mk | 4 |
2 files changed, 5 insertions, 2 deletions
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) |