Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / tools / aidl / 9f4c382a0b0b7448809b3c24de49f8c017167b4c
commit9f4c382a0b0b7448809b3c24de49f8c017167b4c[log] [tgz]
authorJiyong Park <jiyong@google.com>Wed Apr 07 20:36:45 2021 +0900
committerTreehugger Robot <treehugger-gerrit@google.com>Mon Apr 12 23:42:28 2021 +0000
treed35ab5baf9de1ed3dd3721008f473af7de4b8479
parent50c610432273cf8d530edb95f5a9778f862446d0 [diff]
aidl-cpp ensures that output file is at <out_dir>/<package>/<name>.cpp

Background:
When an AIDL file is put to the srcs property of a cc_* module, Soong
creates a build rule that invokes aidl-cpp to convert the AIDL file into
a CPP source code and headers. Specifically, if the AIDL file is at
subdir/android/foo/IFoo.aidl, the command is

aidl-cpp subdir/android/foo/IFoo.aidl\   // input aidl
         out/..../gen/subdir/android/foo/IFoo.aidl\  // output cpp
	 out/..../gen  // directory for output headers

In addition, the build rule has out/.../gen/subdir/android/foo/BnFoo.h,
etc. as the implicit outputs.

Problem:
In the example above, if the package of the AIDL type is "android.foo",
not "subdir.android.foo", then aidl-cpp generates the headers at
out/.../gen/android/foo/BnFoo.h, etc.  Notice the absence of 'subdir'.
These paths are different from the implicit outputs that the Soong
expects. The root cause is that Soong has an implicit assumption that
the package of an AIDL file at subdir/android/foo is
"subdir.android.foo", because it can't look into the AIDL file.

When the actual outputs and the outputs listed in the build rule are
different, Soong thanksfully triggers an error, but the error doesn't
have context and doesn't suggest a way to fix it.

The correct thing the developer should do is to set 'subdir' as the base
directory so that Soong can infer the package name from the relative
path from the base directory.

Solution:
This change adds a check to the AIDL compiler so that it triggers an
error when the output path given by Soong is different from the path
that is calculated based on the correct package name. It also emits a
message suggesting to fix this using the filegroup and the path
property.

Bug: 184586092
Test: aidl_unittests
Change-Id: I0f23b6027ba3a4755cc2901f4a7f7fc70bffd0ef
2 files changed
tree: d35ab5baf9de1ed3dd3721008f473af7de4b8479
  1. aidl_api/
  2. build/
  3. metadata/
  4. tests/
  5. trace/
  6. .clang-format
  7. aidl-format.sh
  8. aidl.cpp
  9. aidl.h
  10. aidl_checkapi.cpp
  11. aidl_checkapi.h
  12. aidl_const_expressions.cpp
  13. aidl_dumpapi.cpp
  14. aidl_dumpapi.h
  15. aidl_language.cpp
  16. aidl_language.h
  17. aidl_language_l.ll
  18. aidl_language_y.yy
  19. aidl_to_cpp.cpp
  20. aidl_to_cpp.h
  21. aidl_to_cpp_common.cpp
  22. aidl_to_cpp_common.h
  23. aidl_to_java.cpp
  24. aidl_to_java.h
  25. aidl_to_ndk.cpp
  26. aidl_to_ndk.h
  27. aidl_to_rust.cpp
  28. aidl_to_rust.h
  29. aidl_typenames.cpp
  30. aidl_typenames.h
  31. aidl_unittest.cpp
  32. Android.bp
  33. ast_cpp.cpp
  34. ast_cpp.h
  35. ast_cpp_unittest.cpp
  36. ast_java.cpp
  37. ast_java.h
  38. ast_java_unittest.cpp
  39. code_writer.cpp
  40. code_writer.h
  41. code_writer_unittest.cpp
  42. comments.cpp
  43. comments.h
  44. diagnostics.cpp
  45. diagnostics.h
  46. diagnostics.inc
  47. diagnostics_unittest.cpp
  48. generate_aidl_mappings.cpp
  49. generate_aidl_mappings.h
  50. generate_cpp.cpp
  51. generate_cpp.h
  52. generate_cpp_unittest.cpp
  53. generate_java.cpp
  54. generate_java.h
  55. generate_java_binder.cpp
  56. generate_ndk.cpp
  57. generate_ndk.h
  58. generate_rust.cpp
  59. generate_rust.h
  60. hiddenapi-greylist
  61. import_resolver.cpp
  62. import_resolver.h
  63. io_delegate.cpp
  64. io_delegate.h
  65. io_delegate_unittest.cpp
  66. line_reader.cpp
  67. line_reader.h
  68. location.cpp
  69. location.h
  70. logging.cpp
  71. logging.h
  72. main.cpp
  73. NOTICE
  74. options.cpp
  75. options.h
  76. options_unittest.cpp
  77. os.h
  78. OWNERS
  79. parser.cpp
  80. parser.h
  81. PREUPLOAD.cfg
  82. README.md
  83. run_integration_tests.sh
  84. TEST_MAPPING
README.md

Documentation for this project is currently maintained here:

https://source.android.com/devices/architecture/aidl/overview