diff --git a/Android.mk b/Android.mk index 097ee8e..533f7d5 100644 --- a/Android.mk +++ b/Android.mk @@ -2,5 +2,3 @@ LOCAL_PATH:= $(call my-dir) include $(call first-makefiles-under,$(LOCAL_PATH)) -include $(CLEAR_VARS) - diff --git a/AndroidBoard.mk b/AndroidBoard.mk index e1a0dca..837b6f3 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -3,6 +3,3 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET) - -# include the non-open-source counterpart to this file --include vendor/meizu/m2note/AndroidBoardVendor.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index f3bc978..89e0ac1 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -13,6 +13,7 @@ TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include # Fragments include -include $(DEVICE_PATH)/board/*.mk +# Fun with flags # MTK flags BOARD_HAS_MTK_HARDWARE := true @@ -25,6 +26,5 @@ BOARD_GLOBAL_CFLAGS += -DDISABLE_ASHMEM_TRACKING BOARD_GLOBAL_CFLAGS += -DCAMERA_VENDOR_L_COMPAT # Camera -# Pre-Nougat cam HALv1 TARGET_HAS_LEGACY_CAMERA_HAL1 := true diff --git a/board/audio.mk b/board/audio.mk index 883759d..6298312 100644 --- a/board/audio.mk +++ b/board/audio.mk @@ -1,7 +1,6 @@ # Audio TARGET_CPU_MEMCPY_OPT_DISABLE := true - # Audio config PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/configs/audio/audio_policy.conf:system/etc/audio_policy.conf \ diff --git a/board/ril.mk b/board/ril.mk index 2013f8a..c0f89fa 100644 --- a/board/ril.mk +++ b/board/ril.mk @@ -2,7 +2,6 @@ BOARD_PROVIDES_RILD := true BOARD_RIL_CLASS := ../../../$(DEVICE_PATH)/ril - # Telephony PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/configs/telephony/ecc_list.xml:system/etc/ecc_list.xml \ diff --git a/device_m2note.mk b/device_m2note.mk index ac1e136..00b76ce 100644 --- a/device_m2note.mk +++ b/device_m2note.mk @@ -6,7 +6,7 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk) DEVICE_PATH := device/meizu/m2note -DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay # Device uses high-density artwork where available PRODUCT_AAPT_CONFIG := normal xhdpi @@ -21,8 +21,3 @@ TARGET_OTA_ASSERT_DEVICE := m2note,m2n,meizu_m2_note $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -ADDITIONAL_DEFAULT_PROPERTIES += \ - ro.allow.mock.location=1 \ - persist.service.acm.enable=0 \ - ro.mount.fs=EXT4 - diff --git a/lineage.mk b/lineage.mk index 4a9fb8e..b26a43b 100644 --- a/lineage.mk +++ b/lineage.mk @@ -1,5 +1,3 @@ -## Specify phone tech before including full_phone -#$(call inherit-product, vendor/cm/config/gsm.mk) # Release name PRODUCT_RELEASE_NAME := M2 Note diff --git a/mtk/rrc/Android.mk b/mtk/rrc/Android.mk deleted file mode 100644 index f452639..0000000 --- a/mtk/rrc/Android.mk +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright Statement: -# -# This software/firmware and related documentation ("MediaTek Software") are -# protected under relevant copyright laws. The information contained herein -# is confidential and proprietary to MediaTek Inc. and/or its licensors. -# Without the prior written permission of MediaTek inc. and/or its licensors, -# any reproduction, modification, use or disclosure of MediaTek Software, -# and information contained herein, in whole or in part, shall be strictly prohibited. -# -# MediaTek Inc. (C) 2010. All rights reserved. -# -# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES -# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE") -# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON -# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. -# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE -# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR -# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH -# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES -# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES -# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK -# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR -# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND -# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE, -# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE, -# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO -# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. -# -# The following software/firmware and/or related documentation ("MediaTek Software") -# have been modified by MediaTek Inc. All revisions are subject to any receiver's -# applicable license agreements with MediaTek Inc. - - -# -# librrc -# -LOCAL_PATH:= $(call my-dir) - - -COMMON_PATH:= common -INCLUDE_PATH:= $(LOCAL_PATH)/inc - -include $(CLEAR_VARS) - -ifeq ($(MTK_DISPLAY_120HZ_SUPPORT), yes) -LOCAL_CFLAGS += -DMTK_RRC_ENABLE -endif - -ifneq ($(TARGET_BUILD_VARIANT), user) -LOCAL_CFLAGS += -DMTK_RRC_ENABLE_PROP -endif - - -LOCAL_SRC_FILES:= \ - $(COMMON_PATH)/refresh_rate_control.cpp \ - -LOCAL_C_INCLUDES:= \ - $(INCLUDE_PATH) \ - - - -LOCAL_STATIC_LIBRARIES := \ - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - -LOCAL_MODULE:= librrc - - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libcutils \ - liblog \ - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) - - diff --git a/mtk/rrc/NOTICE b/mtk/rrc/NOTICE deleted file mode 100644 index 8b13789..0000000 --- a/mtk/rrc/NOTICE +++ /dev/null @@ -1 +0,0 @@ - diff --git a/mtk/rrc/README b/mtk/rrc/README deleted file mode 100644 index c6a4c0a..0000000 --- a/mtk/rrc/README +++ /dev/null @@ -1,24 +0,0 @@ -This directory contains RRC HAL interface, which defines the interface of -Refresh Rate Controller and is used to build a RRC shared library. - -This library is pre-built by MediaTek internal. - -WHAT IT DOES? -============= -librrc.so provides api for notify multimedia scenarios. - -HOW IT WAS BUILT? -================== -It needs the following library from AOSP: -1. liblog.so -2. libutils.so -3. libcutils.so - -All source/dependency modules of this module are already put in -'vendor/mediatek/libs' folder. - -HOW TO USE IT? -============== -Provide api for user notify the active scenarios to decide proper display refresh rate. - -All the source code of this library were written by MediaTek co.. diff --git a/mtk/rrc/common/refresh_rate_control.cpp b/mtk/rrc/common/refresh_rate_control.cpp deleted file mode 100644 index 76efaad..0000000 --- a/mtk/rrc/common/refresh_rate_control.cpp +++ /dev/null @@ -1,256 +0,0 @@ -/* Copyright Statement: - * - * This software/firmware and related documentation ("MediaTek Software") are - * protected under relevant copyright laws. The information contained herein - * is confidential and proprietary to MediaTek Inc. and/or its licensors. - * Without the prior written permission of MediaTek inc. and/or its licensors, - * any reproduction, modification, use or disclosure of MediaTek Software, - * and information contained herein, in whole or in part, shall be strictly prohibited. - */ -/* MediaTek Inc. (C) 2010. All rights reserved. - * - * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES - * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE") - * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON - * AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. - * NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE - * SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR - * SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH - * THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES - * THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES - * CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK - * SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR - * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND - * CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE, - * AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE, - * OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO - * MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. - * - * The following software/firmware and/or related documentation ("MediaTek Software") - * have been modified by MediaTek Inc. All revisions are subject to any receiver's - * applicable license agreements with MediaTek Inc. - */ - -/***************************************************************************** -* Copyright Statement: -* -------------------- -* This software is protected by Copyright and the information contained -* herein is confidential. The software may not be copied and the information -* contained herein may not be used or disclosed except with the written -* permission of MediaTek Inc. (C) 2009 -* -* BY OPENING THIS FILE, BUYER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES -* THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE") -* RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO BUYER ON -* AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. -* NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE -* SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR -* SUPPLIED WITH THE MEDIATEK SOFTWARE, AND BUYER AGREES TO LOOK ONLY TO SUCH -* THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. MEDIATEK SHALL ALSO -* NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE RELEASES MADE TO BUYER'S -* SPECIFICATION OR TO CONFORM TO A PARTICULAR STANDARD OR OPEN FORUM. -* -* BUYER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND CUMULATIVE -* LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE, -* AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE, -* OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY BUYER TO -* MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE. -* -* THE TRANSACTION CONTEMPLATED HEREUNDER SHALL BE CONSTRUED IN ACCORDANCE -* WITH THE LAWS OF THE STATE OF CALIFORNIA, USA, EXCLUDING ITS CONFLICT OF -* LAWS PRINCIPLES. ANY DISPUTES, CONTROVERSIES OR CLAIMS ARISING THEREOF AND -* RELATED THERETO SHALL BE SETTLED BY ARBITRATION IN SAN FRANCISCO, CA, UNDER -* THE RULES OF THE INTERNATIONAL CHAMBER OF COMMERCE (ICC). -* -*****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -#include - -#ifdef MTK_RRC_ENABLE - #define MTK_RRC_INC_DRV -#endif - -#ifdef MTK_RRC_INC_DRV - #include -#endif - -#include - -#include - -#include - -#include - - - -#ifdef LOG_TAG -#undef LOG_TAG -#endif - -#define LOG_TAG "RefreshRateControl" - - - -#define RRC_DRV_NAME "/dev/mtk_rrc" - -static int currentID; - -static unsigned int allocated; - - -RefreshRateControl::RefreshRateControl() -{ -} - - -RefreshRateControl::~RefreshRateControl() -{ -} - - -int RefreshRateControl::setScenario(int scenario, bool enable){ - -#ifdef MTK_RRC_INC_DRV - - int drvID ; - - RRC_DRV_DATA rrc_data ; - unsigned int result = 0; - int config_enable = enable ; - - if(!(scenario > RRC_TYPE_NONE && scenario < RRC_TYPE_MAX_SIZE)){ - ALOGW("[RRC] setScenario RRC Driver scenario error range (%d)", scenario); - return -1; - } - - - -#ifdef MTK_RRC_ENABLE_PROP - - { - char value[PROPERTY_VALUE_MAX]; - unsigned long u4PQOpt; - - property_get("persist.rrc", value, "0"); - u4PQOpt = atol(value); - if(0 != u4PQOpt) - { - - if(u4PQOpt == 1){ - /* skip all event */ - //ALOGW("[RRC] skip all event!!\n"); - return 0; - } else if( u4PQOpt == 2 ) { - /* skip video event */ - if((scenario >= RRC_TYPE_VIDEO_NORMAL && scenario <= RRC_TYPE_VIDEO_WIFI_DISPLAY)){ - return 0; - } - } else if (u4PQOpt == 3) { - /* always keep HIGH */ - if((scenario >= RRC_TYPE_VIDEO_NORMAL && scenario <= RRC_TYPE_VIDEO_WIFI_DISPLAY)){ - return 0; - } - /* skip touch leave */ - if( scenario == RRC_DRV_TYPE_TOUCH_EVENT && enable == 0){ - return 0; - } - } else if (u4PQOpt == 4) { - /* always keep LOW */ - if((scenario >= RRC_TYPE_VIDEO_NORMAL && scenario <= RRC_TYPE_VIDEO_WIFI_DISPLAY)){ - return 0; - } - /* skip touch down */ - if( scenario == RRC_DRV_TYPE_TOUCH_EVENT && enable == 1){ - return 0; - } - } - } - } -#endif - - - ALOGW("[RRC] setScenario %d, config_enable %d!!\n", scenario, config_enable); - - - if(scenario == RRC_TYPE_VIDEO_120HZ) - { - scenario = RRC_DRV_TYPE_VIDEO_PLAYBACK ; - if ( config_enable ){ - config_enable = 2 ; - } - ALOGW("[RRC] Video120Hz setScenario %d, config_enable %d!!\n", scenario, config_enable); - } - - - - drvID = open(RRC_DRV_NAME, O_RDONLY, 0); - - if( drvID == -1 ) - { - ALOGW("Open RRC Driver Error (%s)", strerror(errno)); - return -1; - } - - - if(ioctl(drvID, RRC_IOCTL_CMD_INIT)<0) - { - ALOGW("RefreshRateControl Driver->RRC_IOCTL_CMD_INIT Error (%s)", strerror(errno)); - close(drvID); - drvID = -1; - return -1; - } - - - rrc_data.scenario = scenario ; - rrc_data.enable = config_enable ; - - if(ioctl(drvID, RRC_IOCTL_CMD_SET_SCENARIO_TYPE, &rrc_data) < 0) - { - ALOGW("RefreshRateControl Driver->RRC_IOCTL_CMD_SET_SCENARIO_TYPE Error (%s)", strerror(errno)); - close(drvID); - return -1; - } - - if(ioctl(drvID, RRC_IOCTL_CMD_DEINIT) < 0) - { - return -1; - } - - close(drvID); - -#endif - - return 0; -} - - - - - - - - - - - - - - - diff --git a/mtk/rrc/inc/refresh_rate_control.h b/mtk/rrc/inc/refresh_rate_control.h deleted file mode 100644 index ecf084a..0000000 --- a/mtk/rrc/inc/refresh_rate_control.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __REFRESH_RATE_CONTROL_H__ -#define __REFRESH_RATE_CONTROL_H__ - - -/*----------------------------------------------------------------------------- - Refresh Rate Control Scenario - -----------------------------------------------------------------------------*/ -typedef enum { - - RRC_TYPE_NONE = 0, - RRC_TYPE_VIDEO_NORMAL , - RRC_TYPE_CAMERA_PREVIEW , - RRC_TYPE_CAMERA_ZSD , - RRC_TYPE_CAMERA_CAPTURE , - RRC_TYPE_CAMERA_ICFP , - RRC_TYPE_VIDEO_SWDEC_PLAYBACK , - RRC_TYPE_VIDEO_PLAYBACK , - RRC_TYPE_VIDEO_TELEPHONY , - RRC_TYPE_VIDEO_RECORD , - RRC_TYPE_VIDEO_RECORD_CAMERA , - RRC_TYPE_VIDEO_RECORD_SLOWMOTION , - RRC_TYPE_VIDEO_SNAPSHOT , - RRC_TYPE_VIDEO_LIVE_PHOTO , - RRC_TYPE_VIDEO_WIFI_DISPLAY , - - /* touch event */ - RRC_TYPE_TOUCH_EVENT , - RRC_TYPE_VIDEO_120HZ , - - RRC_TYPE_MAX_SIZE - - -} RRC_SCENARIO_TYPE; - - -typedef enum { - - RRC_60Hz = 0, - RRC_120Hz , - - -} RRC_REFRESH_RATE; - - - -class RefreshRateControl { - - -public: - - RefreshRateControl(); - ~RefreshRateControl(); - - int setScenario(int scenario, bool enable); - - int getRefreshRate(); - -private: - - int getScenario(); - - int setRefreshRate(int refresh); - -}; - -#endif diff --git a/product/packages.mk b/product/packages.mk index 81157c1..57e6f8f 100644 --- a/product/packages.mk +++ b/product/packages.mk @@ -16,8 +16,7 @@ PRODUCT_PACKAGES += \ # Mediatek PRODUCT_PACKAGES += \ libstlport \ - libgralloc_extra \ - librrc + libgralloc_extra # Ion PRODUCT_PACKAGES += libion @@ -52,9 +51,6 @@ PRODUCT_PACKAGES += \ power.default \ power.mt6753 -# Charger -PRODUCT_PACKAGES += charger_res_images - # LiveDisplay PRODUCT_PACKAGES += libjni_livedisplay