| commit | 0d4d44efefb3460b4932d750a3e975ad82bfd88a | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Fri Aug 25 11:29:58 2017 -0700 |
| committer | Aaron Holden <aaronholden@google.com> | Fri Aug 25 11:29:58 2017 -0700 |
| tree | 1b594af8c534003e2b7fc640c7ab440766ceb21b | |
| parent | 3c21064a15651aed869c63a8670b491cc59623c7 [diff] |
Fix dynamic config device location CP'ed from go/aog/469038 Test: run cts -m CtsMediaStressTestCases bug: 65044829 bug: 65044868 Change-Id: I0678143e3835ef90811defcdec9d236af2b616a5
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java index ad38938..c44293e 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
@@ -123,7 +123,8 @@ } if (TestTarget.DEVICE.equals(mTarget)) { - String deviceDest = DynamicConfig.CONFIG_FOLDER_ON_DEVICE + hostFile.getName(); + String deviceDest = String.format("%s%s.dynamic", + DynamicConfig.CONFIG_FOLDER_ON_DEVICE, mModuleName); if (!device.pushFile(hostFile, deviceDest)) { throw new TargetSetupError(String.format( "Failed to push local '%s' to remote '%s'", hostFile.getAbsolutePath(),