summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiwen 'Steve' Cai <jwcai@google.com> 2017-08-23 01:41:22 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-23 01:41:22 +0000
commit8aa3aaeced338ae7b250f21d49fac6e49d88b39e (patch)
tree652283c8b10ccc11abb321077773bdfbf221da8e
parent1c762d8309cb70659c6a8e43c214c3578b28a193 (diff)
parent5807a85f7cb633d517c910245cf3e5b601a740f4 (diff)
Merge "Rename servicetool to pdx_tool" into oc-mr1-dev
am: 5807a85f7c Change-Id: I1da3bc208c05aeda98abe1d54ad98763be701ef1
-rw-r--r--libs/vr/libpdx_default_transport/Android.bp4
-rw-r--r--libs/vr/libpdx_default_transport/pdx_tool.cpp (renamed from libs/vr/libpdx_default_transport/servicetool.cpp)0
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/vr/libpdx_default_transport/Android.bp b/libs/vr/libpdx_default_transport/Android.bp
index 8cfa86fa44..0f6511b362 100644
--- a/libs/vr/libpdx_default_transport/Android.bp
+++ b/libs/vr/libpdx_default_transport/Android.bp
@@ -36,10 +36,10 @@ cc_library_static {
}
cc_binary {
- name: "servicetool",
+ name: "pdx_tool",
defaults: ["pdx_default_transport_compiler_defaults"],
srcs: [
- "servicetool.cpp",
+ "pdx_tool.cpp",
],
shared_libs: [
"liblog",
diff --git a/libs/vr/libpdx_default_transport/servicetool.cpp b/libs/vr/libpdx_default_transport/pdx_tool.cpp
index 60eedb3847..60eedb3847 100644
--- a/libs/vr/libpdx_default_transport/servicetool.cpp
+++ b/libs/vr/libpdx_default_transport/pdx_tool.cpp