Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebc4a50a authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge changes I150dc5fe,I72d327c2,I6c5a97dc am: 46ec1a56 am: e95608bd am:... 

Merge changes I150dc5fe,I72d327c2,I6c5a97dc am: 46ec1a56 am: e95608bd am: 46759aec am: 08b996a9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429028

Change-Id: I27b85d8f4f076a064cce318500c6efc4e7d6fa15
parents f0fd7cbe 08b996a9

include/private/android_filesystem_capability.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../libcutils/include/private/android_filesystem_capability.h
 
 No newline at end of file

include/private/canned_fs_config.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../libcutils/include/private/canned_fs_config.h
 
 No newline at end of file

include/private/fs_config.h

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
// TODO(b/63135587) remove this file after the transitive dependency

// from private/android_filesystem_config.h is resolved. All files that use

// libcutils/include/private/fs_config.h should include the file directly, not

// indirectly via private/android_filesystem_config.h.