Google Git
Sign in
android / platform / system / libvintf / 12a11ac2577e2dee57db250d21cf2ec1ae0f5ca2
commit12a11ac2577e2dee57db250d21cf2ec1ae0f5ca2[log] [tgz]
authorYifan Hong <elsk@google.com>Fri Jan 19 13:58:32 2018 -0800
committerYifan Hong <elsk@google.com>Fri Jan 19 22:55:49 2018 +0000
tree52c0bc75b26ebbdbe6aa35cb95e8e69de32a76c3
parentb64ec9e960bc1204e6794e0083c2145f1f043abf [diff]
Load ODM manifest from /odm/etc/vintf as well

... as /odm/etc/ . /odm/etc/vintf has higher priority
than files under /odm/etc.

As a side effect, simplified the device manifest loading logic.

Test: vintf_object_test
Fixes: 36790901
Change-Id: Ie4816e83ac88492250b030a5a48b9fd4640c0dbb
3 files changed
tree: 52c0bc75b26ebbdbe6aa35cb95e8e69de32a76c3
  1. include/
  2. include-test/
  3. test/
  4. .clang-format
  5. Android.bp
  6. Android.mk
  7. assemble_vintf_main.cpp
  8. AssembleVintf.cpp
  9. check_vintf.cpp
  10. CompatibilityMatrix.cpp
  11. HalInterface.cpp
  12. HalManifest.cpp
  13. KernelConfigParser.cpp
  14. KernelConfigTypedValue.cpp
  15. main.cpp
  16. ManifestHal.cpp
  17. MatrixHal.cpp
  18. MatrixKernel.cpp
  19. MODULE_LICENSE_APACHE2
  20. NOTICE
  21. OWNERS
  22. parse_string.cpp
  23. parse_xml.cpp
  24. PREUPLOAD.cfg
  25. RuntimeInfo-host.cpp
  26. RuntimeInfo-target.cpp
  27. RuntimeInfo.cpp
  28. SystemSdk.cpp
  29. TransportArch.cpp
  30. utils.cpp
  31. utils.h
  32. VintfObject.cpp
  33. VintfObjectRecovery.cpp
  34. XmlFile.cpp