summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BoardConfig-common.mk18
-rw-r--r--a2dp_in_audio_policy_configuration.xml22
-rw-r--r--audio_policy_configuration.xml4
-rw-r--r--audio_policy_configuration_a2dp_offload_disabled.xml30
-rw-r--r--audio_policy_configuration_bluetooth_legacy_hal.xml (renamed from audio_policy_configuration_bluetooth_hal_enabled.xml)29
-rw-r--r--device-common.mk2
-rw-r--r--device.mk15
-rwxr-xr-xinit.firstboot.sh18
-rw-r--r--init.hardware.rc8
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml3
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/config.xml20
-rw-r--r--powerstats/Android.bp2
-rw-r--r--powerstats/service.cpp42
-rw-r--r--self-extractors/extract-lists.txt15
-rw-r--r--self-extractors/qcom/staging/device-partial.mk16
-rw-r--r--self-extractors_sargo/extract-lists.txt15
-rw-r--r--self-extractors_sargo/qcom/staging/device-partial.mk15
-rw-r--r--self-extractors_sargo/root/proprietary/device-vendor.mk4
18 files changed, 136 insertions, 142 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index adabc1d7..3460485c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -24,12 +24,14 @@ TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI2 :=
TARGET_CPU_VARIANT := generic
+TARGET_CPU_VARIANT_RUNTIME := cortex-a75
TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75
TARGET_BOARD_COMMON_PATH := device/google/bonito/sdm710
@@ -233,10 +235,24 @@ BOARD_VENDOR_KERNEL_MODULES += \
$(wildcard device/google/bonito-kernel/*.ko)
endif
+# DTB
+ifeq (,$(filter-out sargo_kasan bonito_kasan, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/kasan
+else ifeq (,$(filter-out sargo_kernel_debug_memory bonito_kernel_debug_memory, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_memory
+else ifeq (,$(filter-out sargo_kernel_debug_locking bonito_kernel_debug_locking, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_locking
+else ifeq (,$(filter-out sargo_kernel_debug_hang bonito_kernel_debug_hang, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_hang
+else ifeq (,$(filter-out sargo_kernel_debug_api bonito_kernel_debug_api, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_api
+else
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel
+endif
+
# Testing related defines
BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/b4s4-setup.sh
# Single vendor RIL with SDM845
BOARD_USES_SDM845_QCRIL := true
-BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel
-include vendor/google_devices/bonito/proprietary/BoardConfigVendor.mk
diff --git a/a2dp_in_audio_policy_configuration.xml b/a2dp_in_audio_policy_configuration.xml
deleted file mode 100644
index 57bd4f81..00000000
--- a/a2dp_in_audio_policy_configuration.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bluetooth Input Audio HAL Audio Policy Configuration file -->
-<module name="a2dp" halVersion="2.0">
- <mixPorts>
- <mixPort name="a2dp input" role="sink">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
- </mixPort>
- </mixPorts>
- <devicePorts>
- <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
- </devicePort>
- </devicePorts>
- <routes>
- <route type="mix" sink="a2dp input"
- sources="BT A2DP In"/>
- </routes>
-</module>
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml
index ce786319..7ad24ee0 100644
--- a/audio_policy_configuration.xml
+++ b/audio_policy_configuration.xml
@@ -232,8 +232,8 @@
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Hearing aid Audio HAL -->
- <xi:include href="hearing_aid_audio_policy_configuration.xml"/>
+ <!-- Bluetooth Audio HAL for Hearing aid -->
+ <xi:include href="bluetooth_hearing_aid_audio_policy_configuration.xml"/>
</modules>
diff --git a/audio_policy_configuration_a2dp_offload_disabled.xml b/audio_policy_configuration_a2dp_offload_disabled.xml
index b45b5901..dcbcd555 100644
--- a/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -112,6 +112,12 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
+ <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+ </devicePort>
+ <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+ </devicePort>
+ <devicePort tagName="Line Out" type="AUDIO_DEVICE_OUT_LINE" role="sink">
+ </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -128,6 +134,8 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
+ <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+ </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
@@ -145,6 +153,12 @@
sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="Speaker Safe"
sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
+ <route type="mix" sink="Wired Headset"
+ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
+ <route type="mix" sink="Wired Headphones"
+ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
+ <route type="mix" sink="Line Out"
+ sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
<route type="mix" sink="BT SCO"
sources="primary output,raw,deep_buffer,voip_rx"/>
<route type="mix" sink="BT SCO Headset"
@@ -158,21 +172,21 @@
<route type="mix" sink="Telephony Tx"
sources="voice_tx,incall_music_uplink"/>
<route type="mix" sink="primary input"
- sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="fast input"
- sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="voice_rx"
sources="Telephony Rx"/>
<route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
<route type="mix" sink="mmap_no_irq_in"
- sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="voip_tx"
- sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
</routes>
</module>
- <!-- A2DP Audio HAL -->
- <xi:include href="a2dp_audio_policy_configuration.xml"/>
+ <!-- A2DP Input Audio HAL -->
+ <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
<!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0">
@@ -197,8 +211,8 @@
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Hearing aid Audio HAL -->
- <xi:include href="hearing_aid_audio_policy_configuration.xml"/>
+ <!-- Bluetooth Audio HAL -->
+ <xi:include href="bluetooth_audio_policy_configuration.xml"/>
</modules>
diff --git a/audio_policy_configuration_bluetooth_hal_enabled.xml b/audio_policy_configuration_bluetooth_legacy_hal.xml
index 7ad24ee0..cf68c9b8 100644
--- a/audio_policy_configuration_bluetooth_hal_enabled.xml
+++ b/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -130,21 +130,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
- encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
- </devicePort>
- <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
- encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
- </devicePort>
- <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
- encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
- </devicePort>
<devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
@@ -197,17 +182,11 @@
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
<route type="mix" sink="voip_tx"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>
- <route type="mix" sink="BT A2DP Out"
- sources="primary output,deep_buffer,compressed_offload"/>
- <route type="mix" sink="BT A2DP Headphones"
- sources="primary output,deep_buffer,compressed_offload"/>
- <route type="mix" sink="BT A2DP Speaker"
- sources="primary output,deep_buffer,compressed_offload"/>
</routes>
</module>
- <!-- A2DP Input Audio HAL -->
- <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
+ <!-- A2DP Audio HAL -->
+ <xi:include href="a2dp_audio_policy_configuration.xml"/>
<!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0">
@@ -232,8 +211,8 @@
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Bluetooth Audio HAL for Hearing aid -->
- <xi:include href="bluetooth_hearing_aid_audio_policy_configuration.xml"/>
+ <!-- Hearing aid Audio HAL -->
+ <xi:include href="hearing_aid_audio_policy_configuration.xml"/>
</modules>
diff --git a/device-common.mk b/device-common.mk
index 8e6c970c..68c7535d 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -35,7 +35,7 @@ PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.ccodec=4
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=512
# Setting vendor SPL
-VENDOR_SECURITY_PATCH = "2018-09-05"
+VENDOR_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
# MIDI feature
PRODUCT_COPY_FILES += \
diff --git a/device.mk b/device.mk
index f7257356..1df0ea78 100644
--- a/device.mk
+++ b/device.mk
@@ -22,6 +22,7 @@ PRODUCT_SOONG_NAMESPACES += \
hardware/google/interfaces \
hardware/google/pixel \
hardware/qcom/sdm710 \
+ vendor/google/camera \
vendor/qcom/sdm710
PRODUCT_PROPERTY_OVERRIDES += \
@@ -89,6 +90,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
$(LOCAL_PATH)/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \
$(LOCAL_PATH)/thermal-engine-$(PRODUCT_HARDWARE).conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-$(PRODUCT_HARDWARE).conf \
+ $(LOCAL_PATH)/init.firstboot.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.firstboot.sh \
$(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh
# Edge Sense initialization script.
@@ -231,6 +233,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.audio.fluence.voicecomm=true \
persist.audio.fluence.voicerec=false \
persist.audio.dualmic.config=endfire \
+ persist.audio.in_mmap_delay_micros=100 \
ro.config.vc_call_vol_steps=7 \
ro.config.media_vol_steps=25 \
@@ -292,6 +295,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.radio.custom_ecc=1 \
persist.vendor.radio.data_ltd_sys_ind=1 \
persist.radio.videopause.mode=1 \
+ persist.vendor.radio.multisim_switch_support=true \
persist.vendor.radio.sib16_support=1 \
persist.vendor.radio.data_con_rprt=true \
persist.vendor.radio.relay_oprt_change=1 \
@@ -424,6 +428,8 @@ PRODUCT_PACKAGES += \
android.hardware.camera.provider@2.4-service_64 \
camera.device@3.2-impl \
camera.sdm710 \
+ libgooglecamerahal \
+ libgoogle_camera_hal_tests \
libqomx_core \
libmmjpeg_interface \
libmmcamera_interface \
@@ -543,15 +549,16 @@ endif
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
$(LOCAL_PATH)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
- $(LOCAL_PATH)/audio_policy_configuration_bluetooth_hal_enabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_hal_enabled.xml \
- $(LOCAL_PATH)/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+ $(LOCAL_PATH)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
$(LOCAL_PATH)/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
$(LOCAL_PATH)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
# Audio XMLs
PRODUCT_COPY_FILES += \
diff --git a/init.firstboot.sh b/init.firstboot.sh
new file mode 100755
index 00000000..05a1b856
--- /dev/null
+++ b/init.firstboot.sh
@@ -0,0 +1,18 @@
+#!/vendor/bin/sh
+
+# Init starts this script in the factory, to trigger shutdown after
+# setupwizard has started, and USB is removed.
+
+# wait for system to settle down after sys.boot_complete
+sleep 5
+
+# Wait for USB to be removed.
+type=`cat /sys/class/power_supply/usb/typec_mode`
+while [ "x$type" != "xNothing attached" ]; do
+ echo Wait for \"$type\" == \"Nothing attached\"
+ sleep 1;
+ type=`cat /sys/class/power_supply/usb/typec_mode`
+done;
+
+# Shutdown
+setprop sys.powerctl shutdown
diff --git a/init.hardware.rc b/init.hardware.rc
index ef6291ab..bb5ca386 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -871,3 +871,11 @@ on property:vendor.all.modules.ready=1
# Enable 2nd qcrild when the property set to dsds
on property:persist.radio.multisim.config=dsds
start vendor.qcrild2
+
+on property:sys.boot_completed=1 && property:ro.boot.mode=firstboot
+ start init-firstboot-sh
+
+service init-firstboot-sh /vendor/bin/init.firstboot.sh
+ user nobody
+ disabled
+ oneshot
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 8e892328..cdcb5f8e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -129,6 +129,9 @@
device does not support multiple advertisement-->
<integer translatable="false" name="config_bluetooth_max_advertisers">4</integer>
+ <!-- Whether Hearing Aid profile is supported -->
+ <bool name="config_hearing_aid_profile_supported">true</bool>
+
<!-- Operating voltage for bluetooth controller. 0 by default-->
<integer translatable="false" name="config_bluetooth_operating_voltage_mv">3300</integer>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index b97b3724..a58935b6 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -37,23 +37,9 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
- <!-- Whether to show a warning notification when the device reaches a certain temperature. -->
+ <!-- Whether to show a warning notification when device's skin temperature is high. -->
<integer name="config_showTemperatureWarning">1</integer>
- <!-- Whether to show a alarm dialog when the device of usb cable reaches a certain temperature. -->
- <integer name="config_showTemperatureAlarm">1</integer>
-
- <!-- Temp at which to show a alarm dialog if config_showTemperatureAlarm is true.
- If < 0, uses the skin temperature sensor shutdown value of index[1] from
- HardwarePropertiesManager#getDeviceTemperatures -->
- <integer name="config_alarmTemperature">63</integer>
-
- <!-- Whether or not beep sound should be when overheat -->
- <bool name="config_alarmTemperatureBeepSound">false</bool>
-
- <!-- Fudge factor for how much below the shutdown temp to show the warning. -->
- <integer name="config_warningTemperatureTolerance">4</integer>
-
- <!-- Fudge factor for how much below the overheat temp to dismiss alarm. -->
- <integer name="config_alarmTemperatureTolerance">10</integer>
+ <!-- Whether to show a alarm dialog when device's usb port is overheating. -->
+ <integer name="config_showUsbPortAlarm">1</integer>
</resources>
diff --git a/powerstats/Android.bp b/powerstats/Android.bp
index 6c99d9fc..5c4fac6d 100644
--- a/powerstats/Android.bp
+++ b/powerstats/Android.bp
@@ -33,6 +33,8 @@ cc_binary {
"liblog",
"libutils",
"android.hardware.power.stats@1.0",
+ "pixelpowerstats_provider_aidl_interface-cpp",
+ "libbinder",
],
vendor: true,
}
diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index 3d9bb205..9feec3fc 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -17,8 +17,12 @@
#define LOG_TAG "android.hardware.power.stats@1.0-service.pixel"
#include <android/log.h>
+#include <binder/IPCThreadState.h>
+#include <binder/IServiceManager.h>
+#include <binder/ProcessState.h>
#include <hidl/HidlTransportSupport.h>
+#include <pixelpowerstats/AidlStateResidencyDataProvider.h>
#include <pixelpowerstats/GenericStateResidencyDataProvider.h>
#include <pixelpowerstats/PowerStats.h>
#include <pixelpowerstats/WlanStateResidencyDataProvider.h>
@@ -39,6 +43,7 @@ using android::hardware::power::stats::V1_0::PowerEntityType;
using android::hardware::power::stats::V1_0::implementation::PowerStats;
// Pixel specific
+using android::hardware::google::pixel::powerstats::AidlStateResidencyDataProvider;
using android::hardware::google::pixel::powerstats::GenericStateResidencyDataProvider;
using android::hardware::google::pixel::powerstats::PowerEntityConfig;
using android::hardware::google::pixel::powerstats::StateResidencyConfig;
@@ -63,8 +68,8 @@ int main(int /* argc */, char ** /* argv */) {
.lastEntryPrefix = "Sleep Last Entered At:",
.lastEntryTransform = rpmConvertToMs}};
- auto rpmSdp =
- std::make_shared<GenericStateResidencyDataProvider>("/sys/power/rpmh_stats/master_stats");
+ sp<GenericStateResidencyDataProvider> rpmSdp =
+ new GenericStateResidencyDataProvider("/sys/power/rpmh_stats/master_stats");
uint32_t apssId = service->addPowerEntity("APSS", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(apssId, PowerEntityConfig("APSS", rpmStateResidencyConfigs));
@@ -78,7 +83,7 @@ int main(int /* argc */, char ** /* argv */) {
uint32_t cdspId = service->addPowerEntity("CDSP", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(cdspId, PowerEntityConfig("CDSP", rpmStateResidencyConfigs));
- service->addStateResidencyDataProvider(std::move(rpmSdp));
+ service->addStateResidencyDataProvider(rpmSdp);
// Add SoC power entity
std::vector<StateResidencyConfig> socStateResidencyConfigs = {
@@ -97,19 +102,38 @@ int main(int /* argc */, char ** /* argv */) {
.totalTimePrefix = "actual last sleep(msec):",
.lastEntrySupported = false}};
- auto socSdp =
- std::make_shared<GenericStateResidencyDataProvider>("/sys/power/system_sleep/stats");
+ sp<GenericStateResidencyDataProvider> socSdp =
+ new GenericStateResidencyDataProvider("/sys/power/system_sleep/stats");
uint32_t socId = service->addPowerEntity("SoC", PowerEntityType::POWER_DOMAIN);
socSdp->addEntity(socId, PowerEntityConfig(socStateResidencyConfigs));
- service->addStateResidencyDataProvider(std::move(socSdp));
+ service->addStateResidencyDataProvider(socSdp);
// Add WLAN power entity
uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM);
- auto wlanSdp =
- std::make_shared<WlanStateResidencyDataProvider>(wlanId, "/d/wlan0/power_stats");
- service->addStateResidencyDataProvider(std::move(wlanSdp));
+ sp<WlanStateResidencyDataProvider> wlanSdp =
+ new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats");
+ service->addStateResidencyDataProvider(wlanSdp);
+
+ // Add Power Entities that require the Aidl data provider
+ sp<AidlStateResidencyDataProvider> aidlSdp = new AidlStateResidencyDataProvider();
+ // TODO(117585786): Add real power entities here
+ // uint32_t mock1Id = service->addPowerEntity("Mock1", PowerEntityType::SUBSYSTEM);
+ // aidlSdp->addEntity(mock1Id, "Mock1", {"state_a", "state_b"});
+ // uint32_t mock2Id = service->addPowerEntity("Mock2", PowerEntityType::SUBSYSTEM);
+ // aidlSdp->addEntity(mock2Id, "Mock2", {"state_c", "state_d"});
+
+ auto serviceStatus = android::defaultServiceManager()->addService(
+ android::String16("power.stats-vendor"), aidlSdp);
+ if (serviceStatus != android::OK) {
+ ALOGE("Unable to register power.stats-vendor service %d", serviceStatus);
+ return 1;
+ }
+ sp<android::ProcessState> ps{android::ProcessState::self()}; // Create non-HW binder threadpool
+ ps->startThreadPool();
+
+ service->addStateResidencyDataProvider(aidlSdp);
// Configure the threadpool
configureRpcThreadpool(1, true /*callerWillJoin*/);
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index de28ec9b..8a9a3a7d 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -6,13 +6,12 @@
qcom)
TO_EXTRACT="\
system/app/QtiTelephonyService/QtiTelephonyService.apk \
- system/compatibility_matrix.xml \
system/etc/cne/andsfCne.xml \
system/etc/cne/Nexus/ATT/ATT_profiles.xml \
system/etc/cne/Nexus/ROW/ROW_profiles.xml \
system/etc/cne/Nexus/VZW/VZW_profiles.xml \
- system/etc/ld.config.28.txt \
- system/etc/llndk.libraries.28.txt \
+ system/etc/ld.config.Q.txt \
+ system/etc/llndk.libraries.Q.txt \
system/etc/permissions/cneapiclient.xml \
system/etc/permissions/com.quicinc.cne.xml \
system/etc/permissions/embms.xml \
@@ -31,13 +30,8 @@
system/framework/com.android.mediadrm.signer.jar \
system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar \
system/framework/javax.obex.jar \
- system/framework/LteDirectDiscoveryLibrary.jar \
- system/framework/org.apache.http.legacy.boot.jar \
- system/framework/org.apache.http.legacy.boot.jar.prof \
system/framework/qcrilhook.jar \
system/framework/QtiTelephonyServicelibrary.jar \
- system/framework/radioconfiginterfacelibrary.jar \
- system/framework/radioconfiglibrary.jar \
system/framework/uimlpalibrary.jar \
system/framework/uimremoteclientlibrary.jar \
system/framework/uimremoteserverlibrary.jar \
@@ -60,7 +54,6 @@
system/lib64/lib-imsvtutils.so \
system/lib64/liblistenjni.so \
system/lib64/liblistensoundmodel2.so \
- system/lib64/liblogcat.so \
system/lib64/libmdsprpc_system.so \
system/lib64/libminui.so \
system/lib64/libqsap_sdk.so \
@@ -70,9 +63,7 @@
system/lib64/libsdsprpc_system.so \
system/lib64/libsecureui_svcsock_system.so \
system/lib64/libsensorslog.so \
- system/lib64/libsepol.so \
system/lib64/libsns_low_lat_stream_stub.so \
- system/lib64/libunwind.so \
system/lib/libadsprpc_system.so \
system/lib/libcdsprpc_system.so \
system/lib/libdiag_system.so \
@@ -90,7 +81,6 @@
system/lib/libmdsprpc_system.so \
system/lib/libminui.so \
system/lib/libnl.so \
- system/lib/libpac.so \
system/lib/libqct_resampler.so \
system/lib/libqsap_sdk.so \
system/lib/libQTEEConnector_system.so \
@@ -100,7 +90,6 @@
system/lib/libsecureui_svcsock_system.so \
system/lib/libsensorslog.so \
system/lib/libsns_low_lat_stream_stub.so \
- system/lib/libunwind.so \
system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so \
"
;;
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 43d00b2f..e66b05f2 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -18,13 +18,12 @@ PRODUCT_PACKAGES := \
# blob(s) necessary for bonito hardware
PRODUCT_COPY_FILES := \
- vendor/qcom/bonito/proprietary/compatibility_matrix.xml:system/compatibility_matrix.xml:qcom \
vendor/qcom/bonito/proprietary/andsfCne.xml:system/etc/cne/andsfCne.xml:qcom \
vendor/qcom/bonito/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
vendor/qcom/bonito/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
vendor/qcom/bonito/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \
- vendor/qcom/bonito/proprietary/ld.config.28.txt:system/etc/ld.config.28.txt:qcom \
- vendor/qcom/bonito/proprietary/llndk.libraries.28.txt:system/etc/llndk.libraries.28.txt:qcom \
+ vendor/qcom/bonito/proprietary/ld.config.Q.txt:system/etc/ld.config.Q.txt:qcom \
+ vendor/qcom/bonito/proprietary/llndk.libraries.Q.txt:system/etc/llndk.libraries.Q.txt:qcom \
vendor/qcom/bonito/proprietary/cneapiclient.xml:system/etc/permissions/cneapiclient.xml:qcom \
vendor/qcom/bonito/proprietary/com.quicinc.cne.xml:system/etc/permissions/com.quicinc.cne.xml:qcom \
vendor/qcom/bonito/proprietary/embms.xml:system/etc/permissions/embms.xml:qcom \
@@ -43,13 +42,8 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bonito/proprietary/com.android.mediadrm.signer.jar:system/framework/com.android.mediadrm.signer.jar:qcom \
vendor/qcom/bonito/proprietary/com.qualcomm.qti.uceservice-V2.0-java.jar:system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar:qcom \
vendor/qcom/bonito/proprietary/javax.obex.jar:system/framework/javax.obex.jar:qcom \
- vendor/qcom/bonito/proprietary/LteDirectDiscoveryLibrary.jar:system/framework/LteDirectDiscoveryLibrary.jar:qcom \
- vendor/qcom/bonito/proprietary/org.apache.http.legacy.boot.jar:system/framework/org.apache.http.legacy.boot.jar:qcom \
- vendor/qcom/bonito/proprietary/org.apache.http.legacy.boot.jar.prof:system/framework/org.apache.http.legacy.boot.jar.prof:qcom \
vendor/qcom/bonito/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
vendor/qcom/bonito/proprietary/QtiTelephonyServicelibrary.jar:system/framework/QtiTelephonyServicelibrary.jar:qcom \
- vendor/qcom/bonito/proprietary/radioconfiginterfacelibrary.jar:system/framework/radioconfiginterfacelibrary.jar:qcom \
- vendor/qcom/bonito/proprietary/radioconfiglibrary.jar:system/framework/radioconfiglibrary.jar:qcom \
vendor/qcom/bonito/proprietary/uimlpalibrary.jar:system/framework/uimlpalibrary.jar:qcom \
vendor/qcom/bonito/proprietary/uimremoteclientlibrary.jar:system/framework/uimremoteclientlibrary.jar:qcom \
vendor/qcom/bonito/proprietary/uimremoteserverlibrary.jar:system/framework/uimremoteserverlibrary.jar:qcom \
@@ -72,7 +66,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bonito/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
vendor/qcom/bonito/proprietary/lib64/liblistenjni.so:system/lib64/liblistenjni.so:qcom \
vendor/qcom/bonito/proprietary/lib64/liblistensoundmodel2.so:system/lib64/liblistensoundmodel2.so:qcom \
- vendor/qcom/bonito/proprietary/lib64/liblogcat.so:system/lib64/liblogcat.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libmdsprpc_system.so:system/lib64/libmdsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libminui.so:system/lib64/libminui.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libqsap_sdk.so:system/lib64/libqsap_sdk.so:qcom \
@@ -82,9 +75,7 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bonito/proprietary/lib64/libsdsprpc_system.so:system/lib64/libsdsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libsecureui_svcsock_system.so:system/lib64/libsecureui_svcsock_system.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libsensorslog.so:system/lib64/libsensorslog.so:qcom \
- vendor/qcom/bonito/proprietary/lib64/libsepol.so:system/lib64/libsepol.so:qcom \
vendor/qcom/bonito/proprietary/lib64/libsns_low_lat_stream_stub.so:system/lib64/libsns_low_lat_stream_stub.so:qcom \
- vendor/qcom/bonito/proprietary/lib64/libunwind.so:system/lib64/libunwind.so:qcom \
vendor/qcom/bonito/proprietary/libadsprpc_system.so:system/lib/libadsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/libcdsprpc_system.so:system/lib/libcdsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \
@@ -102,7 +93,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bonito/proprietary/libmdsprpc_system.so:system/lib/libmdsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/libminui.so:system/lib/libminui.so:qcom \
vendor/qcom/bonito/proprietary/libnl.so:system/lib/libnl.so:qcom \
- vendor/qcom/bonito/proprietary/libpac.so:system/lib/libpac.so:qcom \
vendor/qcom/bonito/proprietary/libqct_resampler.so:system/lib/libqct_resampler.so:qcom \
vendor/qcom/bonito/proprietary/libqsap_sdk.so:system/lib/libqsap_sdk.so:qcom \
vendor/qcom/bonito/proprietary/libQTEEConnector_system.so:system/lib/libQTEEConnector_system.so:qcom \
@@ -111,7 +101,5 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bonito/proprietary/libsdsprpc_system.so:system/lib/libsdsprpc_system.so:qcom \
vendor/qcom/bonito/proprietary/libsecureui_svcsock_system.so:system/lib/libsecureui_svcsock_system.so:qcom \
vendor/qcom/bonito/proprietary/libsensorslog.so:system/lib/libsensorslog.so:qcom \
- vendor/qcom/bonito/proprietary/libsns_device_mode_stub.so:system/lib/libsns_device_mode_stub.so:qcom \
vendor/qcom/bonito/proprietary/libsns_low_lat_stream_stub.so:system/lib/libsns_low_lat_stream_stub.so:qcom \
- vendor/qcom/bonito/proprietary/libunwind.so:system/lib/libunwind.so:qcom \
vendor/qcom/bonito/proprietary/libsns_low_lat_stream_skel.so:system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so:qcom \
diff --git a/self-extractors_sargo/extract-lists.txt b/self-extractors_sargo/extract-lists.txt
index de28ec9b..8a9a3a7d 100644
--- a/self-extractors_sargo/extract-lists.txt
+++ b/self-extractors_sargo/extract-lists.txt
@@ -6,13 +6,12 @@
qcom)
TO_EXTRACT="\
system/app/QtiTelephonyService/QtiTelephonyService.apk \
- system/compatibility_matrix.xml \
system/etc/cne/andsfCne.xml \
system/etc/cne/Nexus/ATT/ATT_profiles.xml \
system/etc/cne/Nexus/ROW/ROW_profiles.xml \
system/etc/cne/Nexus/VZW/VZW_profiles.xml \
- system/etc/ld.config.28.txt \
- system/etc/llndk.libraries.28.txt \
+ system/etc/ld.config.Q.txt \
+ system/etc/llndk.libraries.Q.txt \
system/etc/permissions/cneapiclient.xml \
system/etc/permissions/com.quicinc.cne.xml \
system/etc/permissions/embms.xml \
@@ -31,13 +30,8 @@
system/framework/com.android.mediadrm.signer.jar \
system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar \
system/framework/javax.obex.jar \
- system/framework/LteDirectDiscoveryLibrary.jar \
- system/framework/org.apache.http.legacy.boot.jar \
- system/framework/org.apache.http.legacy.boot.jar.prof \
system/framework/qcrilhook.jar \
system/framework/QtiTelephonyServicelibrary.jar \
- system/framework/radioconfiginterfacelibrary.jar \
- system/framework/radioconfiglibrary.jar \
system/framework/uimlpalibrary.jar \
system/framework/uimremoteclientlibrary.jar \
system/framework/uimremoteserverlibrary.jar \
@@ -60,7 +54,6 @@
system/lib64/lib-imsvtutils.so \
system/lib64/liblistenjni.so \
system/lib64/liblistensoundmodel2.so \
- system/lib64/liblogcat.so \
system/lib64/libmdsprpc_system.so \
system/lib64/libminui.so \
system/lib64/libqsap_sdk.so \
@@ -70,9 +63,7 @@
system/lib64/libsdsprpc_system.so \
system/lib64/libsecureui_svcsock_system.so \
system/lib64/libsensorslog.so \
- system/lib64/libsepol.so \
system/lib64/libsns_low_lat_stream_stub.so \
- system/lib64/libunwind.so \
system/lib/libadsprpc_system.so \
system/lib/libcdsprpc_system.so \
system/lib/libdiag_system.so \
@@ -90,7 +81,6 @@
system/lib/libmdsprpc_system.so \
system/lib/libminui.so \
system/lib/libnl.so \
- system/lib/libpac.so \
system/lib/libqct_resampler.so \
system/lib/libqsap_sdk.so \
system/lib/libQTEEConnector_system.so \
@@ -100,7 +90,6 @@
system/lib/libsecureui_svcsock_system.so \
system/lib/libsensorslog.so \
system/lib/libsns_low_lat_stream_stub.so \
- system/lib/libunwind.so \
system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so \
"
;;
diff --git a/self-extractors_sargo/qcom/staging/device-partial.mk b/self-extractors_sargo/qcom/staging/device-partial.mk
index 7f7f64de..6c1b5690 100644
--- a/self-extractors_sargo/qcom/staging/device-partial.mk
+++ b/self-extractors_sargo/qcom/staging/device-partial.mk
@@ -18,13 +18,12 @@ PRODUCT_PACKAGES := \
# blob(s) necessary for sargo hardware
PRODUCT_COPY_FILES := \
- vendor/qcom/sargo/proprietary/compatibility_matrix.xml:system/compatibility_matrix.xml:qcom \
vendor/qcom/sargo/proprietary/andsfCne.xml:system/etc/cne/andsfCne.xml:qcom \
vendor/qcom/sargo/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
vendor/qcom/sargo/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
vendor/qcom/sargo/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \
- vendor/qcom/sargo/proprietary/ld.config.28.txt:system/etc/ld.config.28.txt:qcom \
- vendor/qcom/sargo/proprietary/llndk.libraries.28.txt:system/etc/llndk.libraries.28.txt:qcom \
+ vendor/qcom/sargo/proprietary/ld.config.Q.txt:system/etc/ld.config.Q.txt:qcom \
+ vendor/qcom/sargo/proprietary/llndk.libraries.Q.txt:system/etc/llndk.libraries.Q.txt:qcom \
vendor/qcom/sargo/proprietary/cneapiclient.xml:system/etc/permissions/cneapiclient.xml:qcom \
vendor/qcom/sargo/proprietary/com.quicinc.cne.xml:system/etc/permissions/com.quicinc.cne.xml:qcom \
vendor/qcom/sargo/proprietary/embms.xml:system/etc/permissions/embms.xml:qcom \
@@ -43,13 +42,8 @@ PRODUCT_COPY_FILES := \
vendor/qcom/sargo/proprietary/com.android.mediadrm.signer.jar:system/framework/com.android.mediadrm.signer.jar:qcom \
vendor/qcom/sargo/proprietary/com.qualcomm.qti.uceservice-V2.0-java.jar:system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar:qcom \
vendor/qcom/sargo/proprietary/javax.obex.jar:system/framework/javax.obex.jar:qcom \
- vendor/qcom/sargo/proprietary/LteDirectDiscoveryLibrary.jar:system/framework/LteDirectDiscoveryLibrary.jar:qcom \
- vendor/qcom/sargo/proprietary/org.apache.http.legacy.boot.jar:system/framework/org.apache.http.legacy.boot.jar:qcom \
- vendor/qcom/sargo/proprietary/org.apache.http.legacy.boot.jar.prof:system/framework/org.apache.http.legacy.boot.jar.prof:qcom \
vendor/qcom/sargo/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
vendor/qcom/sargo/proprietary/QtiTelephonyServicelibrary.jar:system/framework/QtiTelephonyServicelibrary.jar:qcom \
- vendor/qcom/sargo/proprietary/radioconfiginterfacelibrary.jar:system/framework/radioconfiginterfacelibrary.jar:qcom \
- vendor/qcom/sargo/proprietary/radioconfiglibrary.jar:system/framework/radioconfiglibrary.jar:qcom \
vendor/qcom/sargo/proprietary/uimlpalibrary.jar:system/framework/uimlpalibrary.jar:qcom \
vendor/qcom/sargo/proprietary/uimremoteclientlibrary.jar:system/framework/uimremoteclientlibrary.jar:qcom \
vendor/qcom/sargo/proprietary/uimremoteserverlibrary.jar:system/framework/uimremoteserverlibrary.jar:qcom \
@@ -72,7 +66,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/sargo/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
vendor/qcom/sargo/proprietary/lib64/liblistenjni.so:system/lib64/liblistenjni.so:qcom \
vendor/qcom/sargo/proprietary/lib64/liblistensoundmodel2.so:system/lib64/liblistensoundmodel2.so:qcom \
- vendor/qcom/sargo/proprietary/lib64/liblogcat.so:system/lib64/liblogcat.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libmdsprpc_system.so:system/lib64/libmdsprpc_system.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libminui.so:system/lib64/libminui.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libqsap_sdk.so:system/lib64/libqsap_sdk.so:qcom \
@@ -82,9 +75,7 @@ PRODUCT_COPY_FILES := \
vendor/qcom/sargo/proprietary/lib64/libsdsprpc_system.so:system/lib64/libsdsprpc_system.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libsecureui_svcsock_system.so:system/lib64/libsecureui_svcsock_system.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libsensorslog.so:system/lib64/libsensorslog.so:qcom \
- vendor/qcom/sargo/proprietary/lib64/libsepol.so:system/lib64/libsepol.so:qcom \
vendor/qcom/sargo/proprietary/lib64/libsns_low_lat_stream_stub.so:system/lib64/libsns_low_lat_stream_stub.so:qcom \
- vendor/qcom/sargo/proprietary/lib64/libunwind.so:system/lib64/libunwind.so:qcom \
vendor/qcom/sargo/proprietary/libadsprpc_system.so:system/lib/libadsprpc_system.so:qcom \
vendor/qcom/sargo/proprietary/libcdsprpc_system.so:system/lib/libcdsprpc_system.so:qcom \
vendor/qcom/sargo/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \
@@ -102,7 +93,6 @@ PRODUCT_COPY_FILES := \
vendor/qcom/sargo/proprietary/libmdsprpc_system.so:system/lib/libmdsprpc_system.so:qcom \
vendor/qcom/sargo/proprietary/libminui.so:system/lib/libminui.so:qcom \
vendor/qcom/sargo/proprietary/libnl.so:system/lib/libnl.so:qcom \
- vendor/qcom/sargo/proprietary/libpac.so:system/lib/libpac.so:qcom \
vendor/qcom/sargo/proprietary/libqct_resampler.so:system/lib/libqct_resampler.so:qcom \
vendor/qcom/sargo/proprietary/libqsap_sdk.so:system/lib/libqsap_sdk.so:qcom \
vendor/qcom/sargo/proprietary/libQTEEConnector_system.so:system/lib/libQTEEConnector_system.so:qcom \
@@ -112,5 +102,4 @@ PRODUCT_COPY_FILES := \
vendor/qcom/sargo/proprietary/libsecureui_svcsock_system.so:system/lib/libsecureui_svcsock_system.so:qcom \
vendor/qcom/sargo/proprietary/libsensorslog.so:system/lib/libsensorslog.so:qcom \
vendor/qcom/sargo/proprietary/libsns_low_lat_stream_stub.so:system/lib/libsns_low_lat_stream_stub.so:qcom \
- vendor/qcom/sargo/proprietary/libunwind.so:system/lib/libunwind.so:qcom \
vendor/qcom/sargo/proprietary/libsns_low_lat_stream_skel.so:system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so:qcom \
diff --git a/self-extractors_sargo/root/proprietary/device-vendor.mk b/self-extractors_sargo/root/proprietary/device-vendor.mk
index 5b8a1745..acc4b09d 100644
--- a/self-extractors_sargo/root/proprietary/device-vendor.mk
+++ b/self-extractors_sargo/root/proprietary/device-vendor.mk
@@ -12,7 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+ifneq ($(filter sargo,$(TARGET_DEVICE)),)
LOCAL_STEM := sargo/device-partial.mk
+else
+LOCAL_STEM := bonito/device-partial.mk
+endif
$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
$(call inherit-product-if-exists, vendor/qcom/$(LOCAL_STEM))
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 09:12:25 +0000