diff options
| author | 2020-07-09 23:37:24 +0000 | |
|---|---|---|
| committer | 2020-07-09 23:37:44 +0000 | |
| commit | 29e1ae6598404ecdaa58b19b8c28ca2145439e31 (patch) | |
| tree | 33b1063cdd76de9587b51ff90eda9ab665b2e82b | |
| parent | a1a0c516621a6d02d2d9c0816a20565f5a31b684 (diff) | |
Avoid TREBLE_TESTING_OVERRIDE
This is moved from an environmental variable to a function since
getenv is problematic in multi-threaded testing environments.
Bug: 156668058
Bug: 160796914
Test: N/A
Change-Id: Ic90258adad95d3b3c2a6a4758c4e1b5efbedc8fd
| -rw-r--r-- | services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp index 96a7541919..1cea25a80f 100644 --- a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp +++ b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp @@ -29,8 +29,8 @@ #include "SurfaceFlinger.h" // Get the name of the service... #include <binder/IServiceManager.h> - #include <cutils/properties.h> +#include <hidl/ServiceManagement.h> #include <iomanip> #include <thread> @@ -173,7 +173,7 @@ void FakeHwcEnvironment::SetUp() { property_set("debug.sf.hwc_service_name", "mock"); // This allows tests/SF to register/load a HIDL service not listed in manifest files. - setenv("TREBLE_TESTING_OVERRIDE", "true", true); + android::hardware::details::setTrebleTestingOverride(true); property_set("debug.sf.treble_testing_override", "true"); } |