Google Git
Sign in
android / trusty / app / keymaster / 355d3eca9242611954768f040e04c76361b2cdfb
commit355d3eca9242611954768f040e04c76361b2cdfb[log] [tgz]
authorSeth Moore <sethmo@google.com>Mon Feb 14 13:20:50 2022 -0800
committerSeth Moore <sethmo@google.com>Mon Feb 14 13:20:50 2022 -0800
tree162aaa9bb5e4a08b024ebc39a3080cb733251027
parent8f4ca37dde4027588bdb8429026b0b5d81f1dc18 [diff]
Remove undef STRINGIFY

This appears to have been added because of a conflict between the
keymaster logger.h header and the unit test macros.

The keymaster STRINGIFY macros have been renamed to avoid namespace
conflicts, so the undef STRINGIFY in this code is no longer necessary.
In fact, if we leave the compile breaks because it's assumed that
STRINGIFY is defined multiple times.

Test: host-test:keymaster_test
Change-Id: I8d02ff08bf12826477a87cc15964e8d95e779ce5
1 file changed
tree: 162aaa9bb5e4a08b024ebc39a3080cb733251027
  1. atap/
  2. device_unittest/
  3. host_unittest/
  4. ipc/
  5. .clang-format
  6. build-config-usertests
  7. keymaster_attributes.pb.c
  8. keymaster_attributes.pb.h
  9. keymaster_attributes.proto
  10. LICENSE
  11. manifest.json
  12. openssl_keymaster_enforcement.cpp
  13. openssl_keymaster_enforcement.h
  14. OWNERS
  15. PREUPLOAD.cfg
  16. rules.mk
  17. secure_storage_manager.cpp
  18. secure_storage_manager.h
  19. trusty_aes_key.cpp
  20. trusty_aes_key.h
  21. trusty_keymaster.cpp
  22. trusty_keymaster.h
  23. trusty_keymaster_context.cpp
  24. trusty_keymaster_context.h
  25. trusty_keymaster_enforcement.cpp
  26. trusty_keymaster_enforcement.h
  27. trusty_keymaster_messages.h
  28. trusty_logger.h
  29. trusty_remote_provisioning_context.cpp
  30. trusty_remote_provisioning_context.h
  31. trusty_secure_deletion_secret_storage.cpp
  32. trusty_secure_deletion_secret_storage.h
  33. usertests-inc.mk