Gitiles
Code Review Sign In
review.blissroms.org / platform_system_vold / f2c76a04a980474ad034da59d999d1f7351292b4
commitf2c76a04a980474ad034da59d999d1f7351292b4[log] [tgz]
authorTreehugger Robot <treehugger-gerrit@google.com>Fri Sep 11 10:54:23 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Sep 11 10:54:23 2020 +0000
treec1a3876b58eb5cb4fd19fb6a21c97f6bc098c1cf
parent6167310291c0696bbc8aa0f28de447cd3f65c7c0 [diff]
parentdb1154a8f5b6076c707d2f8bce1b6cd7fe7d1eb3 [diff]
[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours am: db1154a8f5 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1400407

Change-Id: I7f72ed45082e2e5f84e18f30cadc511bd68fda9b
tree: c1a3876b58eb5cb4fd19fb6a21c97f6bc098c1cf
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format ⇨ ../../build/soong/scripts/system-clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. Keymaster.cpp
  33. Keymaster.h
  34. KeyStorage.cpp
  35. KeyStorage.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. ScryptParameters.cpp
  54. ScryptParameters.h
  55. secdiscard.cpp
  56. sehandle.h
  57. TEST_MAPPING
  58. Utils.cpp
  59. Utils.h
  60. vdc.cpp
  61. vdc.rc
  62. vold.rc
  63. vold_prepare_subdirs.cpp
  64. VoldNativeService.cpp
  65. VoldNativeService.h
  66. VoldNativeServiceValidation.cpp
  67. VoldNativeServiceValidation.h
  68. VoldUtil.cpp
  69. VoldUtil.h
  70. VolumeManager.cpp
  71. VolumeManager.h
  72. wait_for_keymaster.cpp
  73. wait_for_keymaster.rc