mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 22:30:40 +01:00
844600e8a4
I had to change approach. Unfortunately we can't expect that test_main_lib users link with fileutils, which causes it to not link when the override symbol is missing. New approach: resources_dir_flag is now a separate target, it will be depended upon by the downstream override, which just reads the flag and returns it as the resource dir. This gets rid of the mutable state downstream as well. So: 1) Land this 2) Make downstream read the flag instead of keeping its own state 3) Remove OverrideResourcesDir upstream and clean up the hacks 4) Remove the now orphaned OverrideResourcesDir downstream Bug: webrtc:9792 Change-Id: Ic2ef3910bb5d39d9fb71e06fbbbb6aec4de52e78 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157041 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29487}
20 lines
659 B
C++
20 lines
659 B
C++
/*
|
|
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <string>
|
|
|
|
#ifndef TEST_TESTSUPPORT_RESOURCES_DIR_FLAG_H__
|
|
#define TEST_TESTSUPPORT_RESOURCES_DIR_FLAG_H__
|
|
|
|
#include "absl/flags/flag.h"
|
|
|
|
ABSL_DECLARE_FLAG(std::string, resources_dir);
|
|
|
|
#endif // TEST_TESTSUPPORT_RESOURCES_DIR_FLAG_H__
|