From 4397cd1ea0de6a1a039779293aa9bd4f79f08686 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 15 Dec 2021 10:52:21 +0800 Subject: [PATCH 1/4] avoid SELinux compile error and keep radio flag effective Bug: 209886647 Test: build pass with dmd and vcd not in the ROM Change-Id: I5a52e74a2c7ef600e8314844c261b3a25ad4a737 --- modem/user.mk | 4 +++- modem/userdebug.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modem/user.mk b/modem/user.mk index 81f37736..fb01f2cc 100644 --- a/modem/user.mk +++ b/modem/user.mk @@ -1,2 +1,4 @@ -PRODUCT_PACKAGES += dmd +ifneq ($(BOARD_WITHOUT_RADIO),true) + PRODUCT_PACKAGES += dmd +endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/user diff --git a/modem/userdebug.mk b/modem/userdebug.mk index 87697a75..4fcab646 100644 --- a/modem/userdebug.mk +++ b/modem/userdebug.mk @@ -1,2 +1,4 @@ -PRODUCT_PACKAGES += vcd +ifneq ($(BOARD_WITHOUT_RADIO),true) + PRODUCT_PACKAGES += vcd +endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/userdebug/ From 35230cc1af2ac25729962ebdc35392f7d6e8e292 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Wed, 19 May 2021 20:01:36 +0000 Subject: [PATCH 2/4] Remove redundant build property for reduceOpsTaskSplitting This flag is true for everyone now. No need for it here. Change has no effect. Bug: 183612348 Bug: 185920634 Change-Id: Ia264cfceb5cea4230a1c459fbd3c3f8c99a35bdf (cherry picked from commit 8661e6ae13af04eb4aa299327134d7185b563e24) --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index d900114c..31227d52 100644 --- a/device.mk +++ b/device.mk @@ -1070,10 +1070,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ suspend.short_suspend_backoff_enabled=true \ suspend.max_sleep_time_millis=40000 -# (b/183612348): Enable skia reduceOpsTaskSplitting -PRODUCT_PROPERTY_OVERRIDES += \ - renderthread.skia.reduceopstasksplitting=true - # Enable Incremental on the device PRODUCT_PROPERTY_OVERRIDES += \ ro.incremental.enable=true From 461433004fe8c5e43d21dfa7ebd5ce5cb21144ce Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Wed, 15 Dec 2021 11:58:27 +0800 Subject: [PATCH 3/4] gs101: Re-enable bg groups Bg groups are disabled on sc-v2 first, re-enable them on master for more evaluation. Bug: 171740453 Test: check bg groups are active Change-Id: I6bfbbd79fa898cde99d3ba31ff5766de0e4b4c7a --- task_profiles.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/task_profiles.json b/task_profiles.json index fca5a076..864961fb 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -74,7 +74,7 @@ "Params": { "Controller": "cpu", - "Path": "system" + "Path": "dex2oat" } }, { @@ -135,7 +135,7 @@ "Params": { "Controller": "cpu", - "Path": "system" + "Path": "background" } }, { @@ -245,7 +245,7 @@ "Params": { "Controller": "cpu", - "Path": "system" + "Path": "system-background" } }, { From 73dde0e29082c3c664801b3062282cb5c03a99ad Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 24 Nov 2021 16:13:18 +0800 Subject: [PATCH 4/4] Remove gralloc3 manifests Bug: 207455562 Test: Smoke test Change-Id: I9cdb5e7873c99dbfb467e4eaf040761092a1f370 --- manifest-gralloc3.xml | 231 --------------------------------------- manifest_64-gralloc3.xml | 220 ------------------------------------- 2 files changed, 451 deletions(-) delete mode 100644 manifest-gralloc3.xml delete mode 100644 manifest_64-gralloc3.xml diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml deleted file mode 100644 index ca284dfa..00000000 --- a/manifest-gralloc3.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.0 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 2.0 - - IAllocator - default - - - - android.hardware.graphics.mapper - passthrough - 2.0 - - IMapper - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.memtrack - hwbinder - 1.0 - - IMemtrack - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.drm - hwbinder - 1.0 - - ICryptoFactory - default - - - IDrmFactory - default - - @1.3::ICryptoFactory/clearkey - @1.3::IDrmFactory/clearkey - @1.3::ICryptoFactory/widevine - @1.3::IDrmFactory/widevine - - - android.hardware.dumpstate - hwbinder - 1.0 - - IDumpstateDevice - default - - - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.sensors - hwbinder - 1.0 - - ISensors - default - - - - android.hardware.neuralnetworks - hwbinder - 1.2 - - IDevice - armnn - - @1.2::IDevice/armnn - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - com.google.input - - ITouchContextService - default - - - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.0 - - IBluetoothCcc - default - - - - vendor.google.google_battery - hwbinder - 1.1 - - IGoogleBattery - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 2.0 - - IAudioExt - default - - - - vendor.google.audiometricext - hwbinder - 1.0 - - IAudioMetricExt - default - - - - diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml deleted file mode 100644 index 9dc7924a..00000000 --- a/manifest_64-gralloc3.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.0 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.graphics.allocator - hwbinder - 2.0 - - IAllocator - default - - - - android.hardware.graphics.mapper - passthrough - 2.1 - - IMapper - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.memtrack - hwbinder - 1.0 - - IMemtrack - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.drm - hwbinder - 1.0 - - ICryptoFactory - default - - - IDrmFactory - default - - @1.3::ICryptoFactory/clearkey - @1.3::IDrmFactory/clearkey - @1.3::ICryptoFactory/widevine - @1.3::IDrmFactory/widevine - - - android.hardware.dumpstate - hwbinder - 1.0 - - IDumpstateDevice - default - - - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.sensors - hwbinder - 1.0 - - ISensors - default - - - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - com.google.input - - ITouchContextService - default - - - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.0 - - IBluetoothCcc - default - - - - vendor.google.google_battery - hwbinder - 1.1 - - IGoogleBattery - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 2.0 - - IAudioExt - default - - - - vendor.google.audiometricext - hwbinder - 1.0 - - IAudioMetricExt - default - - - -