summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2014-05-20 21:09:05 +0530
committerAmit Pundir <amit.pundir@linaro.org>2014-05-20 21:09:05 +0530
commitb562a863b26a9ab706ccf5658f18674b3ffd923a (patch)
tree4d265b366e8fe9eb69ec07e74595cd8bf70b9fd1
parentaa43dcbb94246d75ce525d4a7d085916d30e7702 (diff)
downloadjuno-b562a863b26a9ab706ccf5658f18674b3ffd923a.tar.gz
add zygote64_32 specific changes
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--BoardConfig.mk4
-rw-r--r--device.mk4
-rw-r--r--init.rc2
-rwxr-xr-xinit.zygote64_32.rc (renamed from init.zygote64.rc)4
4 files changed, 9 insertions, 5 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c81d4ca..ffaa5c3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,12 +25,12 @@ TARGET_2ND_CPU_ABI2 := armeabi
TARGET_SUPPORTS_32_BIT_APPS := true
2ND_TARGET_TOOLCHAIN_ROOT ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro
2ND_TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro/bin/arm-linux-androideabi-
-APP_PROCESS_LINK ?=
else
TARGET_SUPPORTS_64_BIT_APPS := true
-APP_PROCESS_LINK ?= 1
endif
+APP_PROCESS_LINK ?= 1
+
TARGET_SHELL := ash
BOARD_USES_GENERIC_AUDIO := true
diff --git a/device.mk b/device.mk
index 928d704..27a4a27 100644
--- a/device.mk
+++ b/device.mk
@@ -54,8 +54,8 @@ PRODUCT_RUNTIMES := runtime_libdvm_default runtime_libart
# Needed to sync the system clock with the RTC clock
PRODUCT_PACKAGES += hwclock
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64
-PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.zygote64_32.rc:root/init.zygote64_32.rc
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
device/linaro/common/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
diff --git a/init.rc b/init.rc
index 0a05e78..b6e16d1 100644
--- a/init.rc
+++ b/init.rc
@@ -7,7 +7,7 @@
import /init.environ.rc
import /init.usb.rc
import /init.${ro.hardware}.rc
-import /init.zygote64.rc
+import /init.zygote64_32.rc
import /init.trace.rc
on early-init
diff --git a/init.zygote64.rc b/init.zygote64_32.rc
index afb6d63..a236139 100755
--- a/init.zygote64.rc
+++ b/init.zygote64_32.rc
@@ -6,3 +6,7 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s
onrestart restart media
onrestart restart netd
+service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
+ class main
+ socket zygote_secondary stream 660 root system
+ onrestart restart zygote