diff options
| author | Jiyong Park <jiyong@google.com> | 2020-06-23 15:35:26 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-06-30 18:45:35 +0900 |
| commit | 18953b49172bc80ca0196d90a3d873b4ab24386a (patch) | |
| tree | 719e4d11c764f14d96e2d37ead29113b55c1d8af | |
| parent | 233d637b103bccdbbc732a7467e909095fa53b12 (diff) | |
| download | taimen-18953b49172bc80ca0196d90a3d873b4ab24386a.tar.gz | |
Remove unnecessary sysprop settingsandroid-r-beta-3android-r-beta-2
These debuf.sf.early_* properties have been inactive because they are
all eclipsed by the settings in wahoo/device.mk. Specifically,
// wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES := a=10
// taimen/device.mk
include wahoo/device.mk
PRODUCT_PROPERTY_OVERRIDES += a=20
With above, PRODUCT_PROPERTY_OVERRIDES becomes "a=10 a=20" and the build
system has chosen "a=10" via the uniq-pairs-by-first-component macro.
This was because PRODUCT_* lists were designed with an assumption that
those mk files are inherited (without being included) in which case the
values from more specific *.mk file are 'prepended' (not appaended).
Since the settings in taimen/device.mk has been obsolete, let's remove
them. This problem was actually found with
I9c073a21c8257987cf2378012cadaeeeb698a4fb where duplicated sysprop
assignments are prohibited, which is an attempt to make the sysprop
settings be agnostic to the confusing ordering behavior imposed by the
product inheritance mechanism.
Bug: 117892318
Bug: 158735147
Test: m
Exempt-From-Owner-Approval: cherry-pick master
Merged-In: I6d1dd46edba0ad69586791935fca0da484ef2746
(cherry picked from commit 695f1fbe29f2ea08ed3a5cefb0fa487bea9144f4)
Change-Id: I6d1dd46edba0ad69586791935fca0da484ef2746
| -rw-r--r-- | device.mk | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -140,13 +140,3 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Perfetto traced PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ persist.traced.enable=1 - -# Early phase offset for SurfaceFlinger (b/75985430) -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_phase_offset_ns=1500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_app_phase_offset_ns=500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_phase_offset_ns=1500000 -PRODUCT_PROPERTY_OVERRIDES += \ - debug.sf.early_gl_app_phase_offset_ns=15000000 |