Merge commit 'b8389e025058accedcdbf68ae90651883f2786f2' into HEAD

Change-Id: I5ba7ac9b01056f9045c42b757e5e83aa9b94bd48
This commit is contained in:
Xin Li
2017-11-13 14:35:16 -08:00
23 changed files with 126 additions and 815 deletions

View File

@@ -15,6 +15,5 @@
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_muskie.mk \
$(LOCAL_DIR)/aosp_walleye.mk \
$(LOCAL_DIR)/aosp_walleye_test.mk \

View File

@@ -61,7 +61,8 @@ gDot11Mode=0
# Enable Rx handling options
# Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
rx_mode=4
# Rx_thread + NAPI = 5
rx_mode=5
#Enable VHT on 2.4Ghz
gEnableVhtFor24GHzBand=1
@@ -199,7 +200,7 @@ gVhtTxMCS2x2=2
#bit5 IPA uC ENABLE
#bit6 IPA uC STA ENABLE
#bit8 IPA Real Time Debugging
gIPAConfig=0
gIPAConfig=0x3d
gIPADescSize=800
# Enable/Disable RX full reorder offload
@@ -235,6 +236,10 @@ ght_mpdu_density=4
# 1 - enable 0 - disable(default)
gEnableFlowSteering=1
ce_service_max_yield_time=500
ce_service_max_rx_ind_flush=1
maxMSDUsPerRxInd=8
################ Datapath feature set End ################
#############################################
@@ -600,7 +605,7 @@ gEnableTxBFeeSAP=1
# scan policy disabled
# 4 - enable DBS for connection as well as for scan with async
# scan policy disabled
gDualMacFeatureDisable=2
gDualMacFeatureDisable=1
#Set priority for connection with bssid_hint
g_is_bssid_hint_priority=0

View File

@@ -1,40 +0,0 @@
#
# Copyright 2016 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.
#
# Inherit from the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, device/google/muskie/device-muskie.mk)
$(call inherit-product-if-exists, vendor/google_devices/muskie/proprietary/device-vendor-muskie.mk)
PRODUCT_PACKAGES += \
Dialer \
Launcher3 \
WallpaperPicker
PRODUCT_COPY_FILES += \
device/google/muskie/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf
PRODUCT_RESTRICT_VENDOR_FILES := owner
PRODUCT_MANUFACTURER := Google
PRODUCT_BRAND := Android
PRODUCT_NAME := aosp_muskie
PRODUCT_DEVICE := muskie
PRODUCT_MODEL := AOSP on muskie

View File

@@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \
WallpaperPicker
PRODUCT_COPY_FILES += \
device/google/muskie/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf
device/google/muskie/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
PRODUCT_RESTRICT_VENDOR_FILES := owner

View File

@@ -1,331 +0,0 @@
# List of effect libraries to load. Each library element must contain a "path" element
# giving the full path of the library .so file.
# libraries {
# <lib name> {
# path <lib path>
# }
# }
libraries {
bundle {
path /vendor/lib/soundfx/libbundlewrapper.so
}
reverb {
path /vendor/lib/soundfx/libreverbwrapper.so
}
visualizer_sw {
path /vendor/lib/soundfx/libvisualizer.so
}
visualizer_hw {
path /vendor/lib/soundfx/libqcomvisualizer.so
}
downmix {
path /vendor/lib/soundfx/libdownmix.so
}
loudness_enhancer {
path /vendor/lib/soundfx/libldnhncr.so
}
proxy {
path /vendor/lib/soundfx/libeffectproxy.so
}
offload_bundle {
path /vendor/lib/soundfx/libqcompostprocbundle.so
}
audio_pre_processing {
path /vendor/lib/soundfx/libqcomvoiceprocessing.so
}
volume_listener {
path /vendor/lib/soundfx/libvolumelistener.so
}
}
# Default pre-processing library. Add to audio_effect.conf "libraries" section if
# audio HAL implements support for default software audio pre-processing effects
#
# pre_processing {
# path /system/lib/soundfx/libaudiopreprocessing.so
# }
# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
# The value of the "library" element must correspond to the name of one library element in the
# "libraries" element.
# The name of the effect element is indicative, only the value of the "uuid" element
# designates the effect.
# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the
# generic effect type UUID.
# effects {
# <fx name> {
# library <lib name>
# uuid <effect uuid>
# }
# ...
# }
effects {
# additions for the proxy implementation
# Proxy implementation
#effectname {
#library proxy
#uuid xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
# SW implemetation of the effect. Added as a node under the proxy to
# indicate this as a sub effect.
#libsw {
#library libSW
#uuid yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy
#} End of SW effect
# HW implementation of the effect. Added as a node under the proxy to
# indicate this as a sub effect.
#libhw {
#library libHW
#uuid zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz
#}End of HW effect
#} End of effect proxy
bassboost {
library proxy
uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b
libsw {
library bundle
uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
}
libhw {
library offload_bundle
uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b
}
}
virtualizer {
library proxy
uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b
libsw {
library bundle
uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
}
libhw {
library offload_bundle
uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b
}
}
equalizer {
library proxy
uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b
libsw {
library bundle
uuid ce772f20-847d-11df-bb17-0002a5d5c51b
}
libhw {
library offload_bundle
uuid a0dac280-401c-11e3-9379-0002a5d5c51b
}
}
volume {
library bundle
uuid 119341a0-8469-11df-81f9-0002a5d5c51b
}
reverb_env_aux {
library proxy
uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b
libsw {
library reverb
uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
}
libhw {
library offload_bundle
uuid 79a18026-18fd-4185-8233-0002a5d5c51b
}
}
reverb_env_ins {
library proxy
uuid b707403a-a1c1-4291-9573-0002a5d5c51b
libsw {
library reverb
uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
}
libhw {
library offload_bundle
uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b
}
}
reverb_pre_aux {
library proxy
uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b
libsw {
library reverb
uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
}
libhw {
library offload_bundle
uuid 6987be09-b142-4b41-9056-0002a5d5c51b
}
}
reverb_pre_ins {
library proxy
uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b
libsw {
library reverb
uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
}
libhw {
library offload_bundle
uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b
}
}
visualizer {
library proxy
uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
libsw {
library visualizer_sw
uuid d069d9e0-8329-11df-9168-0002a5d5c51b
}
libhw {
library visualizer_hw
uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
}
}
downmix {
library downmix
uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
}
loudness_enhancer {
library loudness_enhancer
uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
}
aec {
library audio_pre_processing
uuid 5d593ae0-1ef9-11e7-93ae-92361f002671
}
ns {
library audio_pre_processing
uuid 5d593d56-1ef9-11e7-93ae-92361f002671
}
music_helper {
library volume_listener
uuid 08b8b058-0590-11e5-ac71-0025b32654a0
}
ring_helper {
library volume_listener
uuid 0956df94-0590-11e5-bdbe-0025b32654a0
}
alarm_helper {
library volume_listener
uuid 09f303e2-0590-11e5-8fdb-0025b32654a0
}
# voice_helper is called when stream type is voice_call in VoIP usecase
voice_helper {
library volume_listener
uuid 0ace5c08-0590-11e5-ae9e-0025b32654a0
}
notification_helper {
library volume_listener
uuid 0b776dde-0590-11e5-81ba-0025b32654a0
}
}
# additional effect from vendor
# UUID generated using version 1
output_session_processing {
music {
music_helper {
}
}
ring {
ring_helper {
}
}
alarm {
alarm_helper {
}
}
# stream type voice_call is used for VoIP call
voice_call {
voice_helper {
}
}
notification {
notification_helper {
}
}
}
pre_processing {
voice_communication {
aec {
}
ns {
}
}
}
# Default pre-processing effects. Add to audio_effect.conf "effects" section if
# audio HAL implements support for them.
#
# agc {
# library pre_processing
# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
# }
# aec {
# library pre_processing
# uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b
# }
# ns {
# library pre_processing
# uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
# }
# Audio preprocessor configurations.
# The pre processor configuration consists in a list of elements each describing
# pre processor settings for a given input source. Valid input source names are:
# "mic", "camcorder", "voice_recognition", "voice_communication"
# Each input source element contains a list of effects elements. The name of the effect
# element must be the name of one of the effects in the "effects" list of the file.
# Each effect element may optionally contain a list of parameters and their
# default value to apply when the pre processor effect is created.
# A parameter is defined by a "param" element and a "value" element. Each of these elements
# consists in one or more elements specifying a type followed by a value.
# The types defined are: "int", "short", "float", "bool" and "string"
# When both "param" and "value" are a single int, a simple form is allowed where just
# the param and value pair is present in the parameter description
# pre_processing {
# <input source name> {
# <fx name> {
# <param 1 name> {
# param {
# int|short|float|bool|string <value>
# [ int|short|float|bool|string <value> ]
# ...
# }
# value {
# int|short|float|bool|string <value>
# [ int|short|float|bool|string <value> ]
# ...
# }
# }
# <param 2 name > {<param> <value>}
# ...
# }
# ...
# }
# ...
# }
#
# TODO: add default audio pre processor configurations after debug and tuning phase
#

82
audio_effects.xml Normal file
View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
<libraries>
<library name="bundle" path="libbundlewrapper.so"/>
<library name="reverb" path="libreverbwrapper.so"/>
<library name="visualizer_sw" path="libvisualizer.so"/>
<library name="visualizer_hw" path="libqcomvisualizer.so"/>
<library name="downmix" path="libdownmix.so"/>
<library name="loudness_enhancer" path="libldnhncr.so"/>
<library name="proxy" path="libeffectproxy.so"/>
<library name="offload_bundle" path="libqcompostprocbundle.so"/>
<library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
<library name="volume_listener" path="libvolumelistener.so"/>
</libraries>
<effects>
<effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
<libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">
<libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
<libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>
</effectProxy>
<effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
<effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">
<libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">
<libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">
<libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">
<libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>
<libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>
</effectProxy>
<effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">
<libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
<libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>
</effectProxy>
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
<effect name="aec" library="audio_pre_processing" uuid="5d593ae0-1ef9-11e7-93ae-92361f002671"/>
<effect name="ns" library="audio_pre_processing" uuid="5d593d56-1ef9-11e7-93ae-92361f002671"/>
<effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/>
<effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/>
<effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>
<effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
<effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
</effects>
<postprocess>
<stream type="music">
<apply effect="music_helper"/>
</stream>
<stream type="ring">
<apply effect="ring_helper"/>
</stream>
<stream type="alarm">
<apply effect="alarm_helper"/>
</stream>
<stream type="voice_call">
<apply effect="voice_helper"/>
</stream>
<stream type="notification">
<apply effect="notification_helper"/>
</stream>
</postprocess>
<preprocess>
<stream type="voice_communication">
<apply effect="aec"/>
<apply effect="ns"/>
</stream>
</preprocess>
</audio_effects_conf>

View File

@@ -104,11 +104,11 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="QUAT_MI2S_RX-and-SLIMBUS_7_RX"/>
</backend_names>
<gain_db_to_level_mapping>
<gain_level_map db="-70" level="4"/>
<gain_level_map db="-12.5" level="3"/>
<gain_level_map db="-7.2" level="2"/>
<gain_level_map db="-3.6" level="1"/>
<gain_level_map db="0" level="0"/>
<gain_level_map db="-70" level="5"/>
<gain_level_map db="-12.5" level="4"/>
<gain_level_map db="-7.2" level="3"/>
<gain_level_map db="-3.6" level="2"/>
<gain_level_map db="0" level="1"/>
</gain_db_to_level_mapping>
<app_types>
<app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" />

View File

@@ -77,13 +77,15 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5500</point>
<point>53,-2130</point>
<point>60,-1950</point>
<point>73,-1600</point>
<point>80,-1200</point>
<point>86,-680</point>
<point>93,-340</point>
<point>1,-4900</point>
<point>52,-2130</point>
<point>59,-1950</point>
<point>71,-1100</point>
<point>79,-870</point>
<point>84,-680</point>
<point>87,-450</point>
<point>91,-250</point>
<point>95,-100</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"

View File

@@ -37,11 +37,11 @@ PRODUCT_COPY_FILES += \
# 1 is AAUDIO_POLICY_NEVER means only use Legacy path.
# 2 is AAUDIO_POLICY_AUTO means try MMAP then fallback to Legacy path.
# 3 is AAUDIO_POLICY_ALWAYS means only use MMAP path.
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=1
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
# 1 is AAUDIO_POLICY_NEVER means only use SHARED mode
# 2 is AAUDIO_POLICY_AUTO means try EXCLUSIVE then fallback to SHARED mode.
# 3 is AAUDIO_POLICY_ALWAYS means only use EXCLUSIVE mode.
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=1
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
# Increase the apparent size of a hardware burst from 1 msec to 2 msec.
# A "burst" is the number of frames processed at one time.
@@ -76,21 +76,14 @@ PRODUCT_COPY_FILES += \
include device/google/wahoo/device.mk
# Kernel modules
ifeq (,$(filter-out muskie_clang walleye_clang, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == *_clang
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/clang/synaptics_dsx_core_htc.ko \
device/google/wahoo-kernel/clang/synaptics_dsx_rmi_dev_htc.ko \
device/google/wahoo-kernel/clang/synaptics_dsx_fw_update_htc.ko \
device/google/wahoo-kernel/clang/htc_battery.ko
else ifeq (,$(filter-out muskie_gcc walleye_gcc, $(TARGET_PRODUCT)))
ifeq (,$(filter-out walleye_gcc, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == *_gcc
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \
device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \
device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \
device/google/wahoo-kernel/gcc/htc_battery.ko
else ifeq (,$(filter-out muskie_kasan walleye_kasan, $(TARGET_PRODUCT)))
else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == *_kasan
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \

View File

@@ -1,40 +0,0 @@
#
# Copyright 2016 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.
#
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := 560dpi
PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi
PRODUCT_HARDWARE := muskie
# DEVICE_PACKAGE_OVERLAYS for the device should be before
# including common overlays since the one listed first
# takes precedence.
ifdef DEVICE_PACKAGE_OVERLAYS
$(warning Overlays defined in '$(DEVICE_PACKAGE_OVERLAYS)' will override '$(PRODUCT_HARDWARE)' overlays)
endif
DEVICE_PACKAGE_OVERLAYS += device/google/muskie/muskie/overlay
include device/google/muskie/device-common.mk
PRODUCT_PROPERTY_OVERRIDES += \
ro.sf.lcd_density=560 \
# HWUI cache sizes
PRODUCT_PROPERTY_OVERRIDES += \
ro.hwui.texture_cache_size=72 \
ro.hwui.layer_cache_size=48 \
ro.hwui.path_cache_size=32

View File

@@ -39,3 +39,6 @@ on init && property:ro.boot.revision=MP0 # PVT
on init && property:ro.boot.revision=MP1
setprop ro.boot.hardware.revision 1.0
on boot && property:ro.build.type=userdebug
write /sys/class/uio/uio1/device/rtel/rtel 1

View File

@@ -1,6 +1,3 @@
on boot
write /sys/class/uio/uio1/device/rtel/rtel 1
on post-fs-data
# SM DUMP logging collection
mkdir /data/vendor/modem_dump 0777 system system

View File

@@ -1,31 +0,0 @@
#
# Copyright (C) 2016 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.
#
TARGET_BOOTLOADER_BOARD_NAME := muskie
DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056
include device/google/wahoo/BoardConfig.mk
-include vendor/google_devices/muskie/proprietary/BoardConfigVendor.mk
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
#sepolicy common to muskie/walleye
BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy
# Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/wahoo-setup.sh
BOARD_LISA_TARGET_SCRIPTS := device/google/wahoo/lisa/

View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml</string>
</resources>

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/htc/g2pw2100/g2pw2100.xml</string>
</resources>

View File

@@ -1,114 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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. -->
<resources>
<!-- MMS user agent string -->
<string name="config_mms_user_agent" translatable="false">g2pw2100</string>
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G_2PW2100.xml</string>
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0]
Zone 1: array[0] <= LUX < array[1]
...
Zone N: array[N - 1] <= LUX < array[N]
Zone N + 1 array[N] <= LUX < infinity
Must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLevels">
<item>5</item>
<item>20</item>
<item>40</item>
<item>100</item>
<item>325</item>
<item>600</item>
<item>1250</item>
<item>2200</item>
<item>4000</item>
</integer-array>
<!-- Array of output values for LCD backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessLcdBacklightValues">
<item>10</item> <!-- 0-5 -->
<item>33</item> <!-- 5-20 -->
<item>49</item> <!-- 20-40 -->
<item>68</item> <!-- 40-100 -->
<item>87</item> <!-- 100-325 -->
<item>108</item> <!-- 325-600 -->
<item>132</item> <!-- 600-1250 -->
<item>167</item> <!-- 1250-2200 -->
<item>206</item> <!-- 2200-4000 -->
<item>255</item> <!-- 4000+ -->
</integer-array>
<!-- Array of output values for button backlight corresponding to the LUX values
in the config_autoBrightnessLevels array. This array should have size one greater
than the size of the config_autoBrightnessLevels array.
This must be overridden in platform specific overlays -->
<integer-array name="config_autoBrightnessButtonBacklightValues">
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
<item>0</item>
</integer-array>
<!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
<integer name="config_shutdownBatteryTemperature">600</integer>
<!-- Minimum screen brightness allowed by the power manager. -->
<integer name="config_screenBrightnessDim">6</integer>
<!-- Screen brightness when dozing. -->
<integer name="config_screenBrightnessDoze">13</integer>
<!-- Default screen brightness setting.
Must be in the range specified by minimum and maximum. -->
<integer name="config_screenBrightnessSettingDefault">98</integer>
<!-- Default screen brightness for VR setting. Default value: 0x56 => 86. -->
<integer name="config_screenBrightnessForVrSettingDefault">86</integer>
<!-- Minimum screen brightness setting allowed by the power manager.
The user is forbidden from setting the brightness below this level. -->
<integer name="config_screenBrightnessSettingMinimum">4</integer>
<!-- Values for USB port setting. in format of bootmode:current function:new function -->
<string-array translatable="false" name="config_oemUsbModeOverride">
<item>"usbradio:adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp,adb:diag,serial_cdev,rmnet_gsi,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:mtp:diag,serial_cdev,rmnet_gsi:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:rndis,adb:rndis,diag,adb:diag,serial_cdev,rmnet_gsi"</item>
<item>"usbradio:rndis:rndis,diag:diag,serial_cdev,rmnet_gsi"</item>
</string-array>
</resources>

View File

@@ -1,158 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<device name="Android">
<!-- Item not being relevant anymore:
bluetooth.active, bluetooth.on,
wifi.on, wifi.active, wifi.scan as they shoud be provided by WifiActivityEnergyInfo
dsp.audio, dsp.video
-->
<item name="cpu.idle">15</item>
<item name="cpu.awake">14.38</item>
<item name="gps.on">30</item>
<item name="radio.active">50</item>
<item name="radio.scanning">5</item>
<array name="radio.on"> <!-- Strength 0 to BINS-1 -->
<value>6</value> <!-- none -->
<value>5</value> <!-- poor -->
<value>4</value> <!-- moderate -->
<value>3</value> <!-- good -->
<value>3</value> <!-- great -->
</array>
<item name="wifi.controller.voltage">0</item>
<array name="cpu.clusters.cores">
<value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
<value>4</value> <!-- Cluster 1 has 4 cores (cpu4, cpu5, cpu5, cpu7) -->
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
<array name="cpu.speeds.cluster0">
<value>300000</value>
<value>364800</value>
<value>441600</value>
<value>518400</value>
<value>595200</value>
<value>672000</value>
<value>748800</value>
<value>825600</value>
<value>883200</value>
<value>960000</value>
<value>1036800</value>
<value>1094400</value>
<value>1171200</value>
<value>1248000</value>
<value>1324800</value>
<value>1401600</value>
<value>1478400</value>
<value>1555200</value>
<value>1670400</value>
<value>1747200</value>
<value>1824000</value>
<value>1900800</value>
</array>
<array name="cpu.active.cluster0">
<value>103.348000</value>
<value>108.472000</value>
<value>133.136993</value>
<value>111.133003</value>
<value>107.376999</value>
<value>111.085999</value>
<value>104.720001</value>
<value>109.449997</value>
<value>138.858002</value>
<value>111.936996</value>
<value>133.197998</value>
<value>118.005005</value>
<value>117.300003</value>
<value>146.181000</value>
<value>117.845001</value>
<value>123.345993</value>
<value>125.492004</value>
<value>153.684998</value>
<value>132.847000</value>
<value>160.753998</value>
<value>138.453995</value>
<value>149.253998</value>
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state -->
<array name="cpu.speeds.cluster1">
<value>300000</value>
<value>345600</value>
<value>422400</value>
<value>499200</value>
<value>576000</value>
<value>652800</value>
<value>729600</value>
<value>806400</value>
<value>902400</value>
<value>979200</value>
<value>1056000</value>
<value>1132800</value>
<value>1190400</value>
<value>1267200</value>
<value>1344000</value>
<value>1420800</value>
<value>1497600</value>
<value>1574400</value>
<value>1651200</value>
<value>1728000</value>
<value>1804800</value>
<value>1881600</value>
<value>1958400</value>
<value>2035200</value>
<value>2112000</value>
<value>2208000</value>
<value>2265600</value>
<value>2323200</value>
<value>2342400</value>
<value>2361600</value>
<value>2457600</value>
</array>
<array name="cpu.active.cluster1">
<value>143.03</value>
<value>97.95</value>
<value>104.41</value>
<value>103.54</value>
<value>107.21</value>
<value>152.82</value>
<value>156.37</value>
<value>106.92</value>
<value>106.44</value>
<value>113.09</value>
<value>156.63</value>
<value>152.48</value>
<value>136.45</value>
<value>177.21</value>
<value>120.17</value>
<value>166.94</value>
<value>138.59</value>
<value>197.52</value>
<value>161.63</value>
<value>163.24</value>
<value>175.34</value>
<value>183.17</value>
<value>252.96</value>
<value>230.71</value>
<value>286.02</value>
<value>288.12</value>
<value>336.74</value>
<value>325.27</value>
<value>367.62</value>
<value>369.38</value>
<value>342.99</value>
</array>
<item name="screen.on">161.74</item>
<item name="screen.full">122.66</item>
<item name="camera.flashlight">240.10</item>
<item name="camera.avg">1157.88</item>
<item name="battery.capacity">3830</item>
</device>

View File

@@ -21,8 +21,6 @@
system/framework/embmslibrary.jar \
system/framework/rcsimssettings.jar \
system/framework/vendor.qti.qcril.am-V1.0-java.jar \
system/lib64/android.hardware.biometrics.fingerprint@2.1.so \
system/lib64/android.hardware.oemlock@1.0.so \
system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \
system/lib64/libaptX_encoder.so \
system/lib64/libaptXHD_encoder.so \
@@ -33,7 +31,6 @@
system/lib64/lib-imsvtextutils.so \
system/lib64/lib-imsvt.so \
system/lib64/lib-imsvtutils.so \
system/lib64/libion.so \
system/lib64/libiperf.so \
system/lib64/librcc.so \
system/lib/com.qualcomm.qti.imsrtpservice@1.0.so \
@@ -44,7 +41,6 @@
system/lib/lib-imsvtextutils.so \
system/lib/lib-imsvt.so \
system/lib/lib-imsvtutils.so \
system/lib/libion.so \
system/lib/libiperf.so \
system/lib/librcc.so \
system/xbin/iperf3 \

View File

@@ -30,8 +30,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \
vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \
vendor/qcom/walleye/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \
vendor/qcom/walleye/proprietary/lib64/android.hardware.biometrics.fingerprint@2.1.so:system/lib64/android.hardware.biometrics.fingerprint@2.1.so:qcom \
vendor/qcom/walleye/proprietary/lib64/android.hardware.oemlock@1.0.so:system/lib64/android.hardware.oemlock@1.0.so:qcom \
vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
vendor/qcom/walleye/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \
vendor/qcom/walleye/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so:qcom \
@@ -42,7 +40,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/walleye/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \
vendor/qcom/walleye/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \
vendor/qcom/walleye/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
vendor/qcom/walleye/proprietary/lib64/libion.so:system/lib64/libion.so:qcom \
vendor/qcom/walleye/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \
vendor/qcom/walleye/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \
vendor/qcom/walleye/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
@@ -53,7 +50,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/walleye/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \
vendor/qcom/walleye/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \
vendor/qcom/walleye/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \
vendor/qcom/walleye/proprietary/libion.so:system/lib/libion.so:qcom \
vendor/qcom/walleye/proprietary/libiperf.so:system/lib/libiperf.so:qcom \
vendor/qcom/walleye/proprietary/librcc.so:system/lib/librcc.so:qcom \
vendor/qcom/walleye/proprietary/iperf3:system/xbin/iperf3:qcom \

View File

@@ -13,5 +13,5 @@ sensor back_therm
sampling 1000
thresholds 52000
thresholds_clr 48000
actions cluster0+cluster1+gpu+battery
action_info 883200+902400+342000000+3
actions cluster0+cluster1+gpu+battery+report
action_info 883200+902400+342000000+3+1

View File

@@ -56,8 +56,8 @@ sampling 2000
sensor back_therm
thresholds 50000 52000 54000
thresholds_clr 49000 51000 53000
actions cluster0+cluster1+gpu cluster0+cluster1+gpu cluster0+cluster1+gpu
action_info 1094400+1190400+414000000 883200+902400+342000000 300000+300000+257000000
actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report
action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1
[BATTERY-MONITOR]
algo_type monitor
@@ -76,3 +76,12 @@ thresholds 56000
thresholds_clr 55000
actions shutdown
action_info 1
[THROTTLING-NOTIFY]
algo_type monitor
sampling 2000
sensor back_therm
thresholds 40000
thresholds_clr 39000
actions report
action_info 1

View File

@@ -14,6 +14,5 @@
# limitations under the License.
#
add_lunch_combo aosp_muskie-userdebug
add_lunch_combo aosp_walleye-userdebug
add_lunch_combo aosp_walleye_test-userdebug

View File

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := voice_processing_descriptors.c
LOCAL_C_INCLUDES += $(call include-path-for, audio-effects)
LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE := libqcomvoiceprocessingdescriptors
LOCAL_MODULE_RELATIVE_PATH := soundfx