Commit 78c63626 authored by Ole Birketvedt's avatar Ole Birketvedt
Browse files

suzuran: Initial rename - ivy -> suzuran

* Prepare Z5 Compact tree

Change-Id: I3373d797a5611ecc57c8eab7e13ab96ed5723c04
parent 07690411
......@@ -25,7 +25,7 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),ivy)
ifeq ($(TARGET_DEVICE),suzuran)
include $(call all-makefiles-under,$(LOCAL_PATH))
......
......@@ -16,16 +16,16 @@
include device/sony/kitakami-common/BoardConfigCommon.mk
DEVICE_PATH := device/sony/ivy
DEVICE_PATH := device/sony/suzuran
# Use Snapdragon LLVM, if available
TARGET_USE_SDCLANG := true
# Assert
TARGET_OTA_ASSERT_DEVICE := E6533,E6553,ivy,ivy_dsds
TARGET_OTA_ASSERT_DEVICE := E5803,E5823,suzuran
# Boot image/kernel
TARGET_KERNEL_CONFIG := kitakami_ivy_defconfig
TARGET_KERNEL_CONFIG := kitakami_suzuran_defconfig
# Audio
BOARD_HAVE_BCM_FM := true
......@@ -34,10 +34,6 @@ BOARD_HAVE_BCM_FM := true
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
BOARD_CUSTOM_BT_CONFIG := $(DEVICE_PATH)/bluetooth/vnd_generic.txt
# Init
TARGET_INIT_VENDOR_LIB := libinit_ivy
TARGET_UNIFIED_DEVICE := true
# NFC
NFC_NXP_CHIP_TYPE := PN547C2
BOARD_NFC_CHIPSET := pn547
......@@ -65,7 +61,7 @@ WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path"
WIFI_DRIVER_FW_PATH_AP := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin"
WIFI_DRIVER_FW_PATH_STA := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin"
WPA_SUPPLICANT_VERSION := VER_0_8_X
WIFI_BUS := PCIE
WIFI_BUS := SDIO
# Inherit from the proprietary version
-include vendor/sony/ivy/BoardConfigVendor.mk
-include vendor/sony/suzuran/BoardConfigVendor.mk
Copyright 2016 - The CyanogenMod Project
Copyright (C) 2016 - The CyanogenMod Project
Device configuration for Sony Xperia Z3+
Copyright (C) 2017 - The LineageOS Project
Device configuration for Sony Xperia Z5 Compact
=====================================
Basic | Spec Sheet
......@@ -8,15 +10,15 @@ Basic | Spec Sheet
CPU | Quad-core 2.0 GHz ARM® Cortex™ A57 and quad-core 1.5 GHz ARM® Cortex™ A53
CHIPSET | Qualcomm MSM8994 Snapdragon 810
GPU | Adreno 430
Memory | 3 GB
Shipped Android Version | 5.0.2
Memory | 2 GB
Shipped Android Version | 5.1.1
Storage | 32 GB
MicroSD | Up to 200 GB
Battery | 2930 mAh (non-removable)
Dimensions | 146 x 72 x 6.9 mm
Display | 1080 x 1920 pixels, 5.2" IPS LCD
Rear Camera | 20.7 MP, LED flash
MicroSD | Up to 256 GB
Battery | 2700 mAh (non-removable)
Dimensions | 127 x 65 x 8.9 mm
Display | 720 x 1280 pixels, 4.6" IPS LCD
Rear Camera | 23 MP, LED flash
Front Camera | 5.1 MP
Release Date | October 2015
![Sony Xperia Z3+](http://cdn2.gsmarena.com/vv/pics/sony/sony-xperia-z4-1.jpg "Sony Xperia Z3+")
![Sony Xperia Z5 Compact](http://cdn2.gsmarena.com/vv/pics/sony/sony-z5-compact1.jpg "Sony Xperia Z5 Compact")
......@@ -17,7 +17,7 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
#define BTM_DEF_LOCAL_NAME "Xperia Z3+"
#define BTM_DEF_LOCAL_NAME "Xperia Z5 Compact"
#define HCILP_INCLUDED FALSE
#define BT_WAKE_VIA_USERIAL_IOCTL FALSE
#define BTM_WBS_INCLUDED TRUE
......
......@@ -18,7 +18,7 @@
$(call inherit-product, device/sony/kitakami-common/device-common.mk)
# Get non-open-source specific aspects
$(call inherit-product, vendor/sony/ivy/ivy-vendor.mk)
$(call inherit-product, vendor/sony/suzuran/suzuran-vendor.mk)
# Overlays
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
......@@ -55,14 +55,14 @@ PRODUCT_COPY_FILES += \
# Screen density
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
PRODUCT_AAPT_PREF_CONFIG := xhdpi
# Boot animation
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1080
TARGET_SCREEN_HEIGHT := 1280
TARGET_SCREEN_WIDTH := 720
# Dalvik/HWUI
$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk)
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)
# init
......@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
# NFC config
PRODUCT_PACKAGES += \
nfc_nci.ivy
nfc_nci.suzuran
# Flash LED config
PRODUCT_COPY_FILES += \
......
......@@ -18,12 +18,12 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from ivy device
$(call inherit-product, device/sony/ivy/device.mk)
# Inherit from suzuran device
$(call inherit-product, device/sony/suzuran/device.mk)
# Set those variables here to overwrite the inherited values.
PRODUCT_BRAND := Sony
PRODUCT_NAME := full_ivy
PRODUCT_NAME := full_suzuran
PRODUCT_MANUFACTURER := Sony
PRODUCT_DEVICE := ivy
PRODUCT_MODEL := Xperia Z3+
PRODUCT_DEVICE := suzuran
PRODUCT_MODEL := E5823
ifeq ($(TARGET_INIT_VENDOR_LIB),libinit_ivy)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := system/core/init
LOCAL_CFLAGS := -Wall
LOCAL_SRC_FILES := init_ivy.cpp
LOCAL_MODULE := libinit_ivy
include $(BUILD_STATIC_LIBRARY)
endif
/*
* Copyright (C) 2008 The Android Open Source Project
* Copyright (C) 2014 The CyanogenMod Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <stdlib.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "vendor_init.h"
#include "property_service.h"
#include "log.h"
#include "util.h"
static void import_kernel_nv(const std::string& key,
const std::string& value, bool for_emulator __attribute__((unused)))
{
if (key.empty()) return;
if (key == "oemandroidboot.phoneid") {
//Dual Sim variant contains two IMEIs separated by comma.
if ((count(value.begin(), value.end(),',')) > 0) {
property_set("persist.multisim.config", "dsds");
property_set("persist.radio.multisim.config", "dsds");
property_set("ro.telephony.default_network", "9,1");
property_set("ro.semc.product.model", "E6533");
property_set("ro.semc.product.name", "Xperia Z3+ Dual");
property_set("ro.product.model", "E6533");
property_set("ro.product.name", "ivy_dsds");
property_set("ro.product.device", "ivy_dsds");
property_set("ro.build.description", "ivy_dsds-user 7.0 KITAKAMI-2.2.0-170123-1244 1 dev-keys");
property_set("ro.build.fingerprint", "Sony/ivy_dsds/ivy_dsds:7.0/KITAKAMI-2.2.0-170123-1244/1:user/dev-keys");
} else {
property_set("ro.telephony.default_network", "9");
property_set("ro.semc.product.model", "E6553");
property_set("ro.semc.product.name", "Xperia Z3+");
property_set("ro.product.model", "E6553");
property_set("ro.product.name", "ivy");
property_set("ro.product.device", "ivy");
property_set("ro.build.description", "ivy-user 7.0 KITAKAMI-2.2.0-170123-1244 1 dev-keys");
property_set("ro.build.fingerprint", "Sony/ivy/ivy:7.0/KITAKAMI-2.2.0-170123-1244/1:user/dev-keys");
}
}
}
void vendor_load_properties()
{
import_kernel_cmdline(0, import_kernel_nv);
}
......@@ -14,9 +14,16 @@
# limitations under the License.
#
$(call inherit-product, device/sony/ivy/full_ivy.mk)
$(call inherit-product, device/sony/suzuran/full_suzuran.mk)
# Inherit some common CM stuff
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
PRODUCT_NAME := lineage_ivy
PRODUCT_NAME := lineage_suzuran
# Use the latest approved GMS identifiers
PRODUCT_BUILD_PROP_OVERRIDES += \
PRODUCT_NAME=suzuran \
BUILD_FINGERPRINT=Sony/suzuran/suzuran:7.0/KITAKAMI-2.2.1-170315-2214/1:user/dev-keys \
PRIVATE_BUILD_DESC="suzuran-user 7.0 KITAKAMI-2.2.1-170315-2214 1 dev-keys"
......@@ -45,7 +45,7 @@ dev.pm.dyn_samplingrate=1
persist.demo.hdmirotationlock=false
ro.qualcomm.cabl=2
hw.cabl.level=Auto
ro.sf.lcd_density=480
ro.sf.lcd_density=320
ro.opengles.version=196609
# Dex2oat limits
......@@ -122,8 +122,13 @@ ro.qc.sdk.sensors.gestures=true
wifi.interface=wlan0
# Semc props
ro.semc.content.number=PA4
ro.semc.ms_type_id=PM-0796-BV
ro.semc.product.device=E65
ro.semc.content.number=PA5
ro.semc.ms_type_id=PM-0880-BV
ro.semc.product.device=E58
ro.semc.product.model=E5823
ro.semc.product.name=Xperia Z5 Compact
ro.semc.version.cust=1298-1220
ro.semc.version.cust.active=
ro.semc.version.cust_revision=R5D
ro.semc.version.fs=GENERIC
ro.semc.version.fs_revision=32.3.A.0.376
ro.semc.version.fs_revision=32.3.A.2.33
......@@ -14,4 +14,4 @@
# limitations under the License.
#
add_lunch_combo lineage_ivy-userdebug
add_lunch_combo lineage_suzuran-userdebug
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment