summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
Diffstat (limited to 'target/product')
-rw-r--r--target/product/core_base.mk1
-rw-r--r--target/product/core_minimal.mk5
-rw-r--r--target/product/embedded.mk1
-rw-r--r--target/product/emulator.mk1
-rwxr-xr-xtarget/product/full_x86_64.mk3
-rw-r--r--target/product/generic_no_telephony.mk3
6 files changed, 11 insertions, 3 deletions
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 658e502..69bde63 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -62,7 +62,6 @@ PRODUCT_PACKAGES += \
mdnsd \
mms-common \
requestsync \
- screenrecord \
telephony-common \
voip-common
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index eb8d653..7e2b19e 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -77,4 +77,9 @@ PRODUCT_BOOT_JARS := \
PRODUCT_RUNTIMES := runtime_libart_default
PRODUCT_RUNTIMES += runtime_libdvm
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+ ro.zygote=zygote32
+PRODUCT_COPY_FILES += \
+ system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 32d479c..60a19da 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -34,7 +34,6 @@ PRODUCT_PACKAGES += \
libEGL \
libETC1 \
libFFTEm \
- libGLES_android \
libGLESv1_CM \
libGLESv2 \
libbinder \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 6812c22..c094a92 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \
libGLESv1_CM_emulation \
lib_renderControl_enc \
libEGL_emulation \
+ libGLES_android \
libGLESv2_enc \
libOpenglSystemCommon \
libGLESv2_emulation \
diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk
index 8b964c2..ce5dcf7 100755
--- a/target/product/full_x86_64.mk
+++ b/target/product/full_x86_64.mk
@@ -23,6 +23,9 @@
# that isn't a wifi connection. This will instruct init.rc to enable the
# network connection so that you can use it with ADB
+# Override and force 64-bit Zygote. Must come first.
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 814426b..12797f4 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -50,7 +50,8 @@ PRODUCT_PACKAGES += \
bcc \
clatd \
clatd.conf \
- pppd
+ pppd \
+ screenrecord
PRODUCT_PACKAGES += \
librs_jni \