Google Git
Sign in
android / platform / system / tools / aidl / f840ab08799b36d1f95726fc2b24b3a4612b380c
commitf840ab08799b36d1f95726fc2b24b3a4612b380c[log] [tgz]
authorJiyong Park <jiyong@google.com>Tue Jun 11 12:20:28 2019 +0900
committerJiyong Park <jiyong@google.com>Wed Jun 12 00:59:40 2019 +0900
tree22a04d95ef122fa7e11fb773115ce817489b2a60
parente2faf9c0d8db8c6af1dbafd95447d1c8e8cef085 [diff]
fix: incorrect output path

This change fixes a bug that when -o option is used without explicitly
specifying the output path, the output path is determined by
concatenating the directory specified by the -o option and the input
file path and the replacing the suffix .aidl to .java.

This especially is problematic in Windows, because the output path then
contains drive letter (e.g. "C:") in the middle of the path if the input
path is an absolute path. For example,

aidl -o C:\output C:\input\IFoo.aidl

resulted the incorrect output path of C:\output\C:\input\IFoo.java.
It should be C:\input\IFoo.java

This change fixes the problem by not concatenating the output dir with
the input file path.

Bug: 134966834
Test: aidl_unittests

Merged-In: I417623089f7409032483a2f6c79e745c0fc340d3
(cherry picked from commit 56f73d76e064a0bba1a103e5c37bc3d5d57860f9)

Change-Id: I417623089f7409032483a2f6c79e745c0fc340d3
2 files changed
tree: 22a04d95ef122fa7e11fb773115ce817489b2a60
  1. build/
  2. docs/
  3. tests/
  4. .clang-format
  5. aidl.cpp
  6. aidl.h
  7. aidl_apicheck.cpp
  8. aidl_apicheck.h
  9. aidl_language.cpp
  10. aidl_language.h
  11. aidl_language_l.ll
  12. aidl_language_y.yy
  13. aidl_to_cpp.cpp
  14. aidl_to_cpp.h
  15. aidl_to_cpp_common.cpp
  16. aidl_to_cpp_common.h
  17. aidl_to_java.cpp
  18. aidl_to_java.h
  19. aidl_to_ndk.cpp
  20. aidl_to_ndk.h
  21. aidl_typenames.cpp
  22. aidl_typenames.h
  23. aidl_unittest.cpp
  24. Android.bp
  25. ast_cpp.cpp
  26. ast_cpp.h
  27. ast_cpp_unittest.cpp
  28. ast_java.cpp
  29. ast_java.h
  30. ast_java_unittest.cpp
  31. code_writer.cpp
  32. code_writer.h
  33. code_writer_unittest.cpp
  34. generate_aidl_mappings.cpp
  35. generate_aidl_mappings.h
  36. generate_cpp.cpp
  37. generate_cpp.h
  38. generate_cpp_unittest.cpp
  39. generate_java.cpp
  40. generate_java.h
  41. generate_java_binder.cpp
  42. generate_ndk.cpp
  43. generate_ndk.h
  44. import_resolver.cpp
  45. import_resolver.h
  46. io_delegate.cpp
  47. io_delegate.h
  48. io_delegate_unittest.cpp
  49. line_reader.cpp
  50. line_reader.h
  51. logging.h
  52. main.cpp
  53. main_cpp.cpp
  54. MODULE_LICENSE_APACHE2
  55. NOTICE
  56. options.cpp
  57. options.h
  58. options_unittest.cpp
  59. os.h
  60. OWNERS
  61. PREUPLOAD.cfg
  62. runtests.sh
  63. TEST_MAPPING
  64. type_cpp.cpp
  65. type_cpp.h
  66. type_cpp_unittest.cpp
  67. type_java.cpp
  68. type_java.h
  69. type_java_unittest.cpp
  70. type_namespace.cpp
  71. type_namespace.h