diff options
author | Xin Li <delphij@google.com> | 2020-08-27 10:16:05 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:05 -0700 |
commit | f43d76b40d21d9cd8051bbe954aff31db401d288 (patch) | |
tree | d5edb8b3c27deeefcb40a0dd608e671f98ed6bd9 | |
parent | f15eed20658fc146a79a399ace7b85d54669f7de (diff) | |
parent | 82095bf64cda7e9cb4c5df4d64fa6d3790f434fb (diff) | |
download | taimen-temp_sam_168057903.tar.gz |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20
Change-Id: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
-rw-r--r-- | audio_platform_info_tavil.xml | 115 | ||||
-rw-r--r-- | device.mk | 3 | ||||
-rw-r--r-- | mixer_paths_tavil.xml | 68 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 26 | ||||
-rw-r--r-- | overlay/packages/apps/Settings/res/values/bools.xml | 21 | ||||
-rw-r--r-- | self-extractors/qcom/staging/Android.bp.txt | 417 | ||||
-rw-r--r-- | self-extractors/qcom/staging/device-partial.mk | 33 | ||||
-rw-r--r-- | thermal_info_config.json | 3 | ||||
-rw-r--r-- | thermal_info_config_evt.json | 3 |
9 files changed, 601 insertions, 88 deletions
diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml index 29dd509..6056231 100644 --- a/audio_platform_info_tavil.xml +++ b/audio_platform_info_tavil.xml @@ -66,6 +66,7 @@ <usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" /> <usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" /> <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" /> + <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="27" /> </pcm_ids> <config_params> <param key="input_mic_max_count" value="3"/> @@ -120,7 +121,7 @@ frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" responses="-1.17 -1.13 -1.09 -1.06 -1.02 -0.98 -0.96 -0.94 -0.91 -0.87 -0.84 -0.82 -0.79 -0.78 -0.76 -0.75 -0.72 -0.70 -0.68 -0.66 -0.63 -0.60 -0.58 -0.55 -0.53 -0.53 -0.49 -0.46 -0.43 -0.41 -0.37 -0.33 -0.30 -0.27 -0.24 -0.21 -0.16 -0.12 -0.07 -0.02 0.00 0.06 0.09 0.12 0.17 0.24 0.25 0.25 0.35 0.45 0.56 0.66 0.78 0.96 0.98 1.08 1.26 1.49 1.67 1.93 2.04 2.28 2.47 2.65 2.86 3.42 3.93 4.54 5.03 5.59 6.40 7.59 8.72 10.83 10.43 13.91 18.52 25.40 22.48 16.63 13.18 10.53 8.41 5.85 3.78 3.68 3.19 2.93 0.59 2.93 2.62 1.44 3.01" sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.04974 0.15736 0.00426" /> - <microphone device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" + <microphone device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="93" frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" responses="-0.95 -0.91 -0.87 -0.84 -0.79 -0.77 -0.76 -0.75 -0.71 -0.67 -0.65 -0.63 -0.61 -0.61 -0.59 -0.56 -0.56 -0.53 -0.51 -0.50 -0.49 -0.46 -0.45 -0.41 -0.41 -0.37 -0.33 -0.32 -0.30 -0.28 -0.24 -0.23 -0.20 -0.19 -0.15 -0.15 -0.12 -0.09 -0.04 -0.01 0.00 0.02 0.05 0.11 0.14 0.19 0.23 0.31 0.44 0.52 0.63 0.69 0.75 0.84 1.22 1.19 1.13 1.20 1.27 1.36 1.40 1.56 1.65 1.88 1.99 2.11 2.33 2.54 2.89 3.15 3.35 4.08 4.99 5.38 5.05 5.54 6.44 6.66 10.40 8.75 8.47 9.10 8.62 16.96 14.69 16.88 19.24 25.51 29.41 42.32 31.65 33.96 25.48" @@ -130,36 +131,88 @@ <snd_devices> <input_snd_device> <input_snd_device_mic_mapping> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC_TMUS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> - </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_LANDSCAPE"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_INVERT_LANDSCAPE"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_PORTRAIT"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_LANDSCAPE"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_SELFIE_PORTRAIT"> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_NS"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC_NS"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_STEREO"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + <mic_info mic_device_id="builtin_mic_3" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> + </snd_dev> + <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_THREE_MIC"> + <mic_info mic_device_id="builtin_mic_1" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> + <mic_info mic_device_id="builtin_mic_2" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + <mic_info mic_device_id="builtin_mic_3" + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> + </snd_dev> </input_snd_device_mic_mapping> </input_snd_device> </snd_devices> @@ -137,6 +137,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vibrator.hal.tick.duration=4 \ ro.vibrator.hal.heavyclick.duration=12 -# Enable Perfetto traced -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.traced.enable=1 diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml index c702250..b0290fb 100644 --- a/mixer_paths_tavil.xml +++ b/mixer_paths_tavil.xml @@ -2366,6 +2366,74 @@ <path name="incall-music-uplink" /> </path> + <path name="incall-music-uplink2"> + <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" /> + </path> + + <path name="incall-music-uplink2 speaker"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 handset"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 handset-hac"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 display-port"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 bt-sco"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 bt-sco-wb"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 speaker-and-display-port"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 afe-proxy"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 usb-headphones"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 usb-headset"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 speaker-and-usb-headphones"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 headphones"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 speaker-and-headphones"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 speaker-and-bt-sco"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 voice-tty-hco-handset"> + <path name="incall-music-uplink2" /> + </path> + + <path name="incall-music-uplink2 voice-tty-vco-usb"> + <path name="incall-music-uplink2" /> + </path> + <path name ="voice-music-tx"> </path> diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index bab33e2..7ebee49 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -116,19 +116,25 @@ <!-- Whether the display blanks itself when transition from a doze to a non-doze state --> <bool name="config_displayBlanksAfterDoze">true</bool> - <!-- 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: 0x8c => 140. --> <integer name="config_screenBrightnessForVrSettingDefault">140</integer> <!-- Minimum screen brightness for VR setting. Default value: 0x8c => 140. --> <integer name="config_screenBrightnessForVrSettingMinimum">140</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">1</integer> + <!-- Minimum screen brightness setting allowed by power manager. + The user is forbidden from setting the brightness below this level. + Equivalent to 1/255. --> + <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item> + + <!-- Maximum screen brightness allowed by the power manager. + The user is forbidden from setting the brightness above this level. --> + <item name="config_screenBrightnessSettingMaximumFloat" format="float" type="dimen">1.0</item> + + <!-- Default screen brightness setting + Must be in the range specified by minimum and maximum. + Equivalent to 98/255 (default for this device) --> + <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.38188976378</item> <!-- An array describing the screen's backlight values corresponding to the brightness values in the config_screenBrightnessNits array. @@ -292,10 +298,4 @@ <integer-array name="config_longPressVibePattern"> <item>12</item> </integer-array> - - <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) --> - <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool> - - <!-- Enable 802.11ac for Wifi hotspot (SAP) --> - <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool> </resources> diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml deleted file mode 100644 index fdb0565..0000000 --- a/overlay/packages/apps/Settings/res/values/bools.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2015 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. ---> - -<resources> - <!-- Whether to show a preference item for regulatory information in About phone --> - <bool name="config_show_regulatory_info">true</bool> -</resources> - diff --git a/self-extractors/qcom/staging/Android.bp.txt b/self-extractors/qcom/staging/Android.bp.txt new file mode 100644 index 0000000..0cc1c9b --- /dev/null +++ b/self-extractors/qcom/staging/Android.bp.txt @@ -0,0 +1,417 @@ +// Copyright (C) 2020 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. + +soong_namespace { +} + +cc_prebuilt_library_shared { + name: "com.qualcomm.qti.imsrtpservice@1.0", + arch: { + arm: { + srcs: ["com.qualcomm.qti.imsrtpservice@1.0.so"], + shared_libs: [ + "libhidlbase", + // "libhidltransport", + // "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/com.qualcomm.qti.imsrtpservice@1.0.so"], + shared_libs: [ + "libhidlbase", + // "libhidltransport", + // "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, + check_elf_files: false, +} + +cc_prebuilt_library_shared { + name: "libdiag_system", + arch: { + arm: { + srcs: ["libdiag_system.so"], + shared_libs: [ + "liblog", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libdiag_system.so"], + shared_libs: [ + "liblog", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "libimscamera_jni", + arch: { + arm: { + srcs: ["libimscamera_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libimscamera_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "libimsmedia_jni", + arch: { + arm: { + srcs: ["libimsmedia_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "libgui", + "libbinder", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/libimsmedia_jni.so"], + shared_libs: [ + "libnativehelper", + "libcutils", + "libutils", + "libgui", + "libbinder", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvideocodec", + arch: { + arm: { + srcs: ["lib-imsvideocodec.so"], + shared_libs: [ + "libmediandk", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libui", + "libmedia", + "libbinder", + "libGLESv2", + "libgui", + "libdiag_system", + "libEGL", + "lib-imsvtutils", + "libcamera_client", + "lib-imsvtextutils", + "libnativewindow", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvideocodec.so"], + shared_libs: [ + "libmediandk", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libui", + "libmedia", + "libbinder", + "libGLESv2", + "libgui", + "libdiag_system", + "libEGL", + "lib-imsvtutils", + "libcamera_client", + "lib-imsvtextutils", + "libnativewindow", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvtextutils", + arch: { + arm: { + srcs: ["lib-imsvtextutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "lib-imsvtutils", + "libGLESv2", + "libEGL", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvtextutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "lib-imsvtutils", + "libGLESv2", + "libEGL", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "lib-imsvt", + arch: { + arm: { + srcs: ["lib-imsvt.so"], + shared_libs: [ + "libdiag_system", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libgui", + "libui", + "libbinder", + "lib-imsvideocodec", + "lib-imsvtutils", + "libbase", + "libhardware_legacy", + "libhardware", + // "libhwbinder", + "libhidlbase", + // "libhidltransport", + "com.qualcomm.qti.imsrtpservice@1.0", + "librcc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvt.so"], + shared_libs: [ + "libdiag_system", + "libcutils", + "libutils", + "liblog", + "libnativehelper", + "libandroid", + "libgui", + "libui", + "libbinder", + "lib-imsvideocodec", + "lib-imsvtutils", + "libbase", + "libhardware_legacy", + "libhardware", + // "libhwbinder", + "libhidlbase", + // "libhidltransport", + "com.qualcomm.qti.imsrtpservice@1.0", + "librcc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, + check_elf_files: false, +} + +cc_prebuilt_library_shared { + name: "lib-imsvtutils", + arch: { + arm: { + srcs: ["lib-imsvtutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/lib-imsvtutils.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} + +cc_prebuilt_library_shared { + name: "librcc", + arch: { + arm: { + srcs: ["librcc.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + arm64: { + srcs: ["lib64/librcc.so"], + shared_libs: [ + "libutils", + "libcutils", + "liblog", + "libdiag_system", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "both", + owner: "qcom", + strip: { + none: true, + }, +} diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 1e0eb4b..2a53a8a 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -12,11 +12,25 @@ # See the License for the specific language governing permissions and # limitations under the License. +PRODUCT_SOONG_NAMESPACES += \ + vendor/qcom/taimen/proprietary + # AOSP packages required by the blobs PRODUCT_PACKAGES := \ ims # blob(s) necessary for Taimen hardware +PRODUCT_PACKAGES += \ + com.qualcomm.qti.imsrtpservice@1.0 \ + libdiag_system \ + libimscamera_jni \ + libimsmedia_jni \ + lib-imsvideocodec \ + lib-imsvtextutils \ + lib-imsvt \ + lib-imsvtutils \ + librcc \ + PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \ vendor/qcom/taimen/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \ @@ -30,21 +44,4 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/taimen/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \ vendor/qcom/taimen/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ - vendor/qcom/taimen/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libimscamera_jni.so:system/lib64/libimscamera_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/libimsmedia_jni.so:system/lib64/libimsmedia_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvideocodec.so:system/lib64/lib-imsvideocodec.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ - vendor/qcom/taimen/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ - vendor/qcom/taimen/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \ - vendor/qcom/taimen/proprietary/libimscamera_jni.so:system/lib/libimscamera_jni.so:qcom \ - vendor/qcom/taimen/proprietary/libimsmedia_jni.so:system/lib/libimsmedia_jni.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvideocodec.so:system/lib/lib-imsvideocodec.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ - vendor/qcom/taimen/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/taimen/proprietary/librcc.so:system/lib/librcc.so:qcom \ + diff --git a/thermal_info_config.json b/thermal_info_config.json index 087b7eb..02e904e 100644 --- a/thermal_info_config.json +++ b/thermal_info_config.json @@ -148,7 +148,8 @@ 60.0 ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":0.001, + "Monitor":true }, { "Name":"usb_port_temp", diff --git a/thermal_info_config_evt.json b/thermal_info_config_evt.json index 39671b8..f79bca6 100644 --- a/thermal_info_config_evt.json +++ b/thermal_info_config_evt.json @@ -148,7 +148,8 @@ 60.0 ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":0.001, + "Monitor":true }, { "Name":"usb_port_temp", |