diff options
| author | phoglund <phoglund@webrtc.org> | 2016-01-08 05:04:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 13:05:01 +0000 |
| commit | 37ebcf0ce5ad1685bcf659ea75960beb96019647 (patch) | |
| tree | 3253e50cbc9204438e139d4356e0fe1b0d38a0b1 /webrtc/system_wrappers/source | |
| parent | b71b4f0c7af57ef5b676c6ed70bf945282c90e3a (diff) | |
| download | webrtc-37ebcf0ce5ad1685bcf659ea75960beb96019647.tar.gz | |
Reland "Add APK targets to build libjingle tests for Android."
patchset #10 id:180001 of https://codereview.webrtc.org/1511633002/
This reverts commit bc14164aad254e72ce4d1e381b912b7d3acf5391.
We have made more preparations downstream, so this should work now. Original CL by perkj@.
BUG=webrtc:2365
The work started from the work by kjellander@ in https://codereview.webrtc.org/1413663003/
Review URL: https://codereview.webrtc.org/1570513004
Cr-Commit-Position: refs/heads/master@{#11186}
Diffstat (limited to 'webrtc/system_wrappers/source')
| -rw-r--r-- | webrtc/system_wrappers/source/field_trial_default.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webrtc/system_wrappers/source/field_trial_default.cc b/webrtc/system_wrappers/source/field_trial_default.cc index 1a9bd6bc79..0e2c286117 100644 --- a/webrtc/system_wrappers/source/field_trial_default.cc +++ b/webrtc/system_wrappers/source/field_trial_default.cc @@ -58,5 +58,9 @@ void InitFieldTrialsFromString(const char* trials_string) { trials_init_string = trials_string; } +const char* GetFieldTrialString() { + return trials_init_string; +} + } // namespace field_trial } // namespace webrtc |