Commit f81c5e0a authored by d0n (d0n@d0nmachine)'s avatar d0n (d0n@d0nmachine)
Browse files

rebase

Change-Id: Id07c0f5a0ca6cfe392810a29b49962bf9d37f819
parent 2792ea78
Loading
Loading
Loading
Loading
+4 −16
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ VSYNC_EVENT_PHASE_OFFSET_NS := -8000000
SF_VSYNC_EVENT_PHASE_OFFSET_NS := -8000000
PRESENT_TIME_OFFSET_FROM_VSYNC_NS := 0

BOARD_EGL_CFG := vendor/mad/prebuilt/etc/egl.cfg

# Vold
TARGET_KERNEL_HAVE_EXFAT := true

@@ -22,11 +20,9 @@ TARGET_KERNEL_HAVE_EXFAT := true
USE_XML_AUDIO_POLICY_CONF := 1

# Wifi
BOARD_WLAN_DEVICE := MediaTek
WPA_SUPPLICANT_VERSION := VER_0_8_X
BOARD_HOSTAPD_DRIVER := NL80211
BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_mt66xx
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_mt66xx
WIFI_DRIVER_FW_PATH_PARAM := "/dev/wmtWifi"
WIFI_DRIVER_FW_PATH_STA := STA
@@ -37,9 +33,6 @@ WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wmtWifi"
WIFI_DRIVER_STATE_ON := 1
WIFI_DRIVER_STATE_OFF := 0

# Bluetooth
BOARD_HAVE_BLUETOOTH := true

# Charger
BACKLIGHT_PATH := /sys/class/leds/lcd-backlight/brightness

@@ -76,9 +69,4 @@ endif

# SELinux
BOARD_SEPOLICY_DIRS := \
    vendor/mad/sepolicy

# DEXPREOPT
ifneq ($(TARGET_BUILD_VARIANT),user)
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
endif
    vendor/mediatek/sepolicy
+10 −51
Original line number Diff line number Diff line
# Common overlays
DEVICE_PACKAGE_OVERLAYS += vendor/mad/overlay
DEVICE_PACKAGE_OVERLAYS += vendor/mediatek/overlay

# Shim libraries
PRODUCT_PACKAGES += \
@@ -73,7 +73,7 @@ PRODUCT_PACKAGES += \
    libcurl

PRODUCT_COPY_FILES += \
    vendor/mad/prebuilt/etc/agps_profiles_conf2.xml:system/etc/agps_profiles_conf2.xml
    vendor/mediatek/prebuilt/etc/agps_profiles_conf2.xml:system/etc/agps_profiles_conf2.xml

# Jelly
PRODUCT_PACKAGES += \
@@ -91,14 +91,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
    madCamera

# madWallpapers
PRODUCT_PACKAGES += \
    madWallpapers

# madLauncher
PRODUCT_PACKAGES += \
    madLauncher

# Include explicitly to work around Facelock issues
PRODUCT_PACKAGES += \
    libprotobuf-cpp-full
@@ -133,7 +125,6 @@ PRODUCT_PACKAGES += \
# Charger
PRODUCT_PACKAGES += \
    charger_res_images \
    mad_charger_res_images

# WallpaperPicker
PRODUCT_PACKAGES += \
@@ -151,22 +142,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
    ThemeInterfacer

# Eleven
PRODUCT_PACKAGES += \
    Eleven

# Bootanimation
ifneq ($(filter 720,$(TARGET_SCREEN_WIDTH)),)
    PRODUCT_COPY_FILES += \
        vendor/mad/prebuilt/bootanimation/720p.zip:system/media/bootanimation.zip
endif
ifneq ($(filter 1080,$(TARGET_SCREEN_WIDTH)),)
    PRODUCT_COPY_FILES += \
        vendor/mad/prebuilt/bootanimation/1080p.zip:system/media/bootanimation.zip
endif

PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0

# WiFi Display
# this property enables the user to access Google WFD settings.
PRODUCT_PROPERTY_OVERRIDES += \
@@ -176,32 +151,16 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_PROPERTY_OVERRIDES += \
    ro.build.selinux=1

# madOS Versioning
ANDROID_VERSION = 8.1.0
MADOS_VERSION = 2.1.3

ifndef MADOS_BUILD_TYPE
    MADOS_BUILD_TYPE := OFFICIAL
endif

MADOS_MOD_VERSION := madOS-$(MADOS_VERSION)-$(shell date -u +%Y%m%d)-$(MADOS_BUILD_TYPE)
LINEAGE_VERSION := 15.1

PRODUCT_PROPERTY_OVERRIDES += \
    ro.mados.version=$(MADOS_VERSION) \
    ro.mados.releasetype=$(MADOS_BUILD_TYPE) \
    ro.modversion=$(MADOS_MOD_VERSION)

MADOS_DISPLAY_VERSION := madOS-$(MADOS_VERSION)-$(MADOS_BUILD_TYPE)

PRODUCT_PROPERTY_OVERRIDES += \
    ro.mados.display.version=$(MADOS_DISPLAY_VERSION)
ANDROID_VERSION := 8.1.0

# include other configs
include vendor/mad/config/permissions.mk
include vendor/mad/config/media.mk
include vendor/mad/config/wifi.mk
include vendor/mad/config/telephony.mk
include vendor/mad/config/google_override.mk
include vendor/mediatek/config/permissions.mk
include vendor/mediatek/config/media.mk
include vendor/mediatek/config/wifi.mk
include vendor/mediatek/config/telephony.mk
include vendor/mediatek/config/google_override.mk

# DEBUG_BOOT
include vendor/mad/config/debug_boot.mk
include vendor/mediatek/config/debug_boot.mk
+0 −15
Original line number Diff line number Diff line
# Copyright (C) 2017 The madOS 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.

# Google properties overides
PRODUCT_PROPERTY_OVERRIDES += \
    keyguard.no_require_sim=true \
    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
+3 −3
Original line number Diff line number Diff line
# Configs
PRODUCT_COPY_FILES += \
    vendor/mad/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml \
    vendor/mad/prebuilt/etc/ecc_list.xml:system/etc/ecc_list.xml \
    vendor/mad/prebuilt/etc/spn-conf.xml:system/etc/spn-conf.xml
    vendor/mediatek/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml \
    vendor/mediatek/prebuilt/etc/ecc_list.xml:system/etc/ecc_list.xml \
    vendor/mediatek/prebuilt/etc/spn-conf.xml:system/etc/spn-conf.xml

# Messaging
PRODUCT_PACKAGES += \
+3 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ PRODUCT_PACKAGES += \
    wpa_supplicant

PRODUCT_COPY_FILES += \
    vendor/mad/prebuilt/etc/wifi/wpa_supplicant.conf:system/vendor/etc/wifi/wpa_supplicant.conf \
    vendor/mad/prebuilt/etc/wifi/wpa_supplicant_overlay.conf:system/vendor/etc/wifi/wpa_supplicant_overlay.conf \
    vendor/mad/prebuilt/etc/wifi/p2p_supplicant_overlay.conf:system/vendor/etc/wifi/p2p_supplicant_overlay.conf
    vendor/mediatek/prebuilt/etc/wifi/wpa_supplicant.conf:system/vendor/etc/wifi/wpa_supplicant.conf \
    vendor/mediatek/prebuilt/etc/wifi/wpa_supplicant_overlay.conf:system/vendor/etc/wifi/wpa_supplicant_overlay.conf \
    vendor/mediatek/prebuilt/etc/wifi/p2p_supplicant_overlay.conf:system/vendor/etc/wifi/p2p_supplicant_overlay.conf

PRODUCT_PROPERTY_OVERRIDES += \
    ro.boot.wificountrycode=00