From 0297f3990423da813a97e3ba99bbc01a36245bb6 Mon Sep 17 00:00:00 2001 From: Miodrag Dinic Date: Fri, 1 Sep 2017 15:17:38 +0200 Subject: [PATCH] Fix mips emulator boot The following commit introduced regression: 7b5e1ab emulator: squash misc modifications from oc-emu-dev Emulators for mips should also use unencrypted data partition like arm. Encryption is only enabled for Intel. Change-Id: I3dba08621d8f679a707f516fff735bba31bfc629 Signed-off-by: Miodrag Dinic --- target/product/aosp_mips.mk | 15 ++++++++++++++- target/product/aosp_mips64.mk | 18 +++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/target/product/aosp_mips.mk b/target/product/aosp_mips.mk index a76b93a46..5ee618555 100644 --- a/target/product/aosp_mips.mk +++ b/target/product/aosp_mips.mk @@ -1,5 +1,5 @@ # -# Copyright 2013 The Android Open-Source Project +# Copyright 2017 The Android Open-Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib/libreference-ril.so + +# Note: the following lines need to stay at the beginning so that it can +# take priority and override the rules it inherit from other mk files +# see copy file rules in core/Makefile +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/mips/3.18/kernel-qemu2:kernel-ranchu \ + device/generic/goldfish/fstab.ranchu.mips:root/fstab.ranchu \ + device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + include $(SRC_TARGET_DIR)/product/full_mips.mk PRODUCT_NAME := aosp_mips diff --git a/target/product/aosp_mips64.mk b/target/product/aosp_mips64.mk index f606858e5..73d3731de 100644 --- a/target/product/aosp_mips64.mk +++ b/target/product/aosp_mips64.mk @@ -1,5 +1,5 @@ # -# Copyright 2013 The Android Open-Source Project +# Copyright 2017 The Android Open-Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,14 +14,22 @@ # limitations under the License. # +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib64/libreference-ril.so + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric -# mips64 build quite specifically for the emulator, and might not be +# build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -# This is for enabling ethernet support for ranchu. -# Consider removing this after RIL support is provided in ranchu. -PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml +# Note: the following lines need to stay at the beginning so that it can +# take priority and override the rules it inherit from other mk files +# see copy file rules in core/Makefile +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/mips64/3.18/kernel-qemu2:kernel-ranchu \ + device/generic/goldfish/fstab.ranchu.mips:root/fstab.ranchu \ + device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)