diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
| commit | 0ed41f1a9564c0733ad155b742ac66fb41d2f9d3 (patch) | |
| tree | fb32ef8d494ee1952b99a65f876a9e28da004a1b /tools/gator/daemon/CapturedXML.cpp | |
| parent | a3d64deb4ee72f27441dd5363d74c294b7dd34a7 (diff) | |
| parent | b93dcce48cc6182fcf66cb6d72665b10c775f4c3 (diff) | |
Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel into v3.10/topic/gatorv3.10/topic/gator
* 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel:
gator: Enable multiple source copies to exist in Android build environments
gator: Add config for building the module in-tree
gator: Version 5.21.1
Diffstat (limited to 'tools/gator/daemon/CapturedXML.cpp')
| -rw-r--r-- | tools/gator/daemon/CapturedXML.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/gator/daemon/CapturedXML.cpp b/tools/gator/daemon/CapturedXML.cpp index 0b5802c893bb..1854c77dcb0e 100644 --- a/tools/gator/daemon/CapturedXML.cpp +++ b/tools/gator/daemon/CapturedXML.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2010-2014. All rights reserved. + * Copyright (C) ARM Limited 2010-2015. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -34,7 +34,6 @@ mxml_node_t* CapturedXML::getTree(bool includeTime) { mxmlElementSetAttr(captured, "version", "1"); if (gSessionData->perf.isSetup()) { mxmlElementSetAttr(captured, "type", "Perf"); - mxmlElementSetAttr(captured, "perf_beta", "yes"); } mxmlElementSetAttrf(captured, "protocol", "%d", PROTOCOL_VERSION); if (includeTime) { // Send the following only after the capture is complete @@ -98,7 +97,7 @@ void CapturedXML::write(char* path) { char* xml = getXML(true); if (util->writeToDisk(file, xml) < 0) { - logg->logError(__FILE__, __LINE__, "Error writing %s\nPlease verify the path.", file); + logg->logError("Error writing %s\nPlease verify the path.", file); handleException(); } |