diff options
| -rw-r--r-- | aicp.mk | 44 | ||||
| -rw-r--r-- | common-packages.mk | 4 | ||||
| -rw-r--r-- | common-prop.mk | 4 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | hardware/qcom/custom.mk | 45 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/aicp_config.xml | 29 | ||||
| -rw-r--r-- | overlay/packages/apps/ExtendedSettings/res/drawable/ic_extended_settings.xml | 17 | ||||
| -rw-r--r-- | rootdir/init.recovery.common.rc | 2 | ||||
| -rw-r--r-- | rootdir/vendor/etc/init/hw/init.common.rc | 3 |
9 files changed, 148 insertions, 4 deletions
@@ -0,0 +1,44 @@ +# Copyright (C) 2014 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. +# 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. + +# Common path +COMMON_PATH := device/sony/common + +# Sony AOSP Project +SONY_AOSP ?= true + +# Sony HALs +SONY_QCOM_HAL_ROOT := hardware/sony/qcom-$(SOMC_KERNEL_VERSION) +PRODUCT_SOONG_NAMESPACES += $(SONY_QCOM_HAL_ROOT) + +# Common kernel source +TARGET_KERNEL_SOURCE := kernel/sony/msm-$(SOMC_KERNEL_VERSION) +TARGET_COMPILE_WITH_MSM_KERNEL := true + +# SELinux +#BOARD_USE_ENFORCING_SELINUX := false +#PRODUCT_PROPERTY_OVERRIDES += \ +# ro.build.selinux=1 + +# Healthd +HEALTHD_FORCE_BACKLIGHT_CONTROL := true +HEALTHD_ENABLE_TRICOLOR_LED := true +RED_LED_PATH := /sys/class/leds/led:rgb_red/brightness +GREEN_LED_PATH := /sys/class/leds/led:rgb_green/brightness +BLUE_LED_PATH := /sys/class/leds/led:rgb_blue/brightness + +TARGET_EXFAT_DRIVER := sdfat + +# Command Line Tools +BOARD_INCLUDE_CMDLINE_TOOLS := true diff --git a/common-packages.mk b/common-packages.mk index 2941bfc..699d50c 100644 --- a/common-packages.mk +++ b/common-packages.mk @@ -150,3 +150,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fs_config_files \ fs_config_dirs + +# Default thermal hw module: +PRODUCT_PACKAGES += \ + thermal.default diff --git a/common-prop.mk b/common-prop.mk index 63343c1..c0ddeee 100644 --- a/common-prop.mk +++ b/common-prop.mk @@ -175,8 +175,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.odm.expect.version=$(PLATFORM_VERSION)_$(SOMC_KERNEL_VERSION)_$(SOMC_PLATFORM)_$(TARGET_VENDOR_VERSION) # Priv-app permisisons -PRODUCT_PROPERTY_OVERRIDES += \ - ro.control_privapp_permissions=enforce +#PRODUCT_PROPERTY_OVERRIDES += \ +# ro.control_privapp_permissions=enforce # Perform color transform on the client PRODUCT_PROPERTY_OVERRIDES += \ @@ -124,8 +124,8 @@ PRODUCT_PACKAGES += \ firmware_folders # Community APN list -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/vendor/etc/apns-conf.xml:system/etc/apns-conf.xml +#PRODUCT_COPY_FILES += \ +# $(COMMON_PATH)/rootdir/vendor/etc/apns-conf.xml:system/etc/apns-conf.xml $(call inherit-product, device/sony/common/common-init.mk) $(call inherit-product, device/sony/common/common-odm.mk) diff --git a/hardware/qcom/custom.mk b/hardware/qcom/custom.mk new file mode 100644 index 0000000..3772571 --- /dev/null +++ b/hardware/qcom/custom.mk @@ -0,0 +1,45 @@ +ifneq ($(AICP_BUILD),) +# Board platforms lists to be used for +# TARGET_BOARD_PLATFORM specific featurization +QCOM_BOARD_PLATFORMS += msm8952 msm8996 msm8998 sdm660 sdm845 + +QCOM_NEW_MEDIA_PLATFORM := msm8952 msm8996 msm8998 sdm660 sdm845 sm8150 + +#List of targets that use video hw +MSM_VIDC_TARGET_LIST := msm8952 msm8996 msm8998 sdm660 sdm845 + +#List of targets that use master side content protection +MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845 + +SONY_QCOM_HAL_ROOT := hardware/sony/qcom-$(SOMC_KERNEL_VERSION) + +audio-hal := $(SONY_QCOM_HAL_ROOT)/audio +gps-hal := $(SONY_QCOM_HAL_ROOT)/gps/sdm845 +display-hal := $(SONY_QCOM_HAL_ROOT)/display + +ifneq ($(filter $(QCOM_NEW_MEDIA_PLATFORM), $(TARGET_BOARD_PLATFORM)),) +QCOM_MEDIA_ROOT := $(SONY_QCOM_HAL_ROOT)/media/sm8150 +else +QCOM_MEDIA_ROOT := $(SONY_QCOM_HAL_ROOT)/media/msm8998 +endif + +OMX_VIDEO_PATH := mm-video-v4l2 +media-hal := $(QCOM_MEDIA_ROOT) + +SRC_CAMERA_HAL_DIR ?= hardware/sony/camera +SRC_DISPLAY_HAL_DIR := $(display-hal) +SRC_MEDIA_HAL_DIR := $(QCOM_MEDIA_ROOT) +TARGET_KERNEL_VERSION := $(SOMC_KERNEL_VERSION) + +include device/sony/common/hardware/qcom/utils.mk + +#include $(display-hal)/Android.mk +include $(call all-makefiles-under,$(audio-hal)) +include $(call all-makefiles-under,$(gps-hal)) +include $(call all-makefiles-under,$(media-hal)) + +ifneq ($(ipa-hal),) +include $(call first-makefiles-under,$(ipa-hal)) +endif + +endif diff --git a/overlay/frameworks/base/core/res/res/values/aicp_config.xml b/overlay/frameworks/base/core/res/res/values/aicp_config.xml new file mode 100644 index 0000000..6d4e03a --- /dev/null +++ b/overlay/frameworks/base/core/res/res/values/aicp_config.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +** 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. Do not translate. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Does the battery LED support multiple colors. Used to decide if the user can change the colors --> + <bool name="config_multiColorBatteryLed">true</bool> + + <bool name="config_multiColorNotificationLed">true</bool> + +</resources> diff --git a/overlay/packages/apps/ExtendedSettings/res/drawable/ic_extended_settings.xml b/overlay/packages/apps/ExtendedSettings/res/drawable/ic_extended_settings.xml new file mode 100644 index 0000000..286fab6 --- /dev/null +++ b/overlay/packages/apps/ExtendedSettings/res/drawable/ic_extended_settings.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> + + <group + android:translateY="-1028.3622"> + <path + android:fillColor="#ffffff" + android:pathData="M 11.033495,1031.4093 c -1.9123677,0 -4.0876217,0.3727 -5.93323,1.2309 -1.7051363,0.7913 -3.1002637,2.0694 -3.1002637,4.1903 -0.00143,1.911 1.1655234,3.0293 1.1349258,2.9987 0.4965201,0.4757 1.2948252,1.2851 3.3852167,1.7608 0.9332354,0.2114 2.9305943,0.5382 4.9194572,0.7551 1.973564,0.2156 3.916508,0.4216 4.706489,0.6303 0.628648,0.1654 1.685545,0.3921 1.685545,1.6244 0,1.2267 -1.112736,1.6021 -1.306059,1.6828 -0.193323,0.08 -1.528297,0.7163 -3.926058,0.7163 -1.771896,0 -3.9013502,-0.555 -4.6774239,-0.8429 -0.894293,-0.331 -1.8331892,-0.769 -2.708011,-1.8802 -0.2183576,-0.2768 -0.5603992,-1.0349 -0.5603992,-1.7858 l -2.172331,0 0,6.3268 2.4143649,0 0,-0.8554 c 0,-0.096 0.1154376,-0.4981 0.5215544,-0.3062 0.5034745,0.2379 1.9834187,0.85 3.530003,1.188 1.2684208,0.2739 2.0861978,0.4715 3.6633798,0.4715 2.573004,0 3.955277,-0.4339 4.910766,-0.7191 0.899854,-0.2669 2.012603,-0.7498 2.916631,-1.4994 C 20.926228,1046.6915 22,1045.6526 22,1043.7681 c 0,-1.8095 -0.933279,-2.9334 -1.261511,-3.2755 -0.447842,-0.4646 -0.994431,-0.8275 -1.564665,-1.1043 -0.49652,-0.2434 -1.279623,-0.534 -1.920788,-0.6981 -1.243386,-0.3171 -4.055589,-0.7094 -5.401895,-0.8554 -1.408893,-0.153 -3.8567245,-0.3642 -4.8330751,-0.6786 -0.2962433,-0.096 -0.8999538,-0.3949 -0.8999538,-1.1238 0,-0.5187 0.2754024,-0.9584 0.8219921,-1.3144 0.8664761,-0.5633 2.6163471,-0.9152 4.4410948,-0.9152 2.15715,-0.01 3.983288,0.5048 5.146007,1.0445 0.394991,0.1836 0.856578,0.448 1.223752,0.7595 0.414463,0.3518 0.997169,1.0806 1.207181,2.1 l 1.948497,0 0,-5.5075 -2.175046,0 0,0.6397 c 0,0.2072 -0.206048,0.4757 -0.594084,0.2532 -0.973569,-0.5299 -3.727117,-1.6773 -7.104011,-1.6829 z" /> + </group> + +</vector> diff --git a/rootdir/init.recovery.common.rc b/rootdir/init.recovery.common.rc index 4ec8e8e..57c6b64 100644 --- a/rootdir/init.recovery.common.rc +++ b/rootdir/init.recovery.common.rc @@ -1,3 +1,5 @@ +import /init.recovery.twrp.rc + on init # USB setup mkdir /config 0770 shell shell diff --git a/rootdir/vendor/etc/init/hw/init.common.rc b/rootdir/vendor/etc/init/hw/init.common.rc index b4fc08e..392ff68 100644 --- a/rootdir/vendor/etc/init/hw/init.common.rc +++ b/rootdir/vendor/etc/init/hw/init.common.rc @@ -113,6 +113,9 @@ on late-fs wait_for_prop hwservicemanager.ready true + # enable ril-daemon manually since it is disabled by default + enable ril-daemon + on post-fs-data # We can start netd here before in is launched in common init.rc on zygote-start start netd |