commit 46ec1a561d8052765ce90995537d0708c968b041
author Tom Cherry <tomcherry@google.com> Wed Sep 16 20:38:33 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 20:38:33 2020 +0000
tree 2961b6f8910d93430279b59158b2a3aac9e4ab50
parent 840d7b2aa8b1bc71c22dce0683f8991f2bfb67a9
parent 7eb9580a298506625e11f19f57302ffc88c141a9

Merge changes I150dc5fe,I72d327c2,I6c5a97dc

* changes:
  Remove include/private/android_filesystem_capability.h
  Remove include/private/canned_fs_config.h
  Remove include/private/fs_config.h

include/private/android_filesystem_capability.h

diff --git a/include/private/android_filesystem_capability.h b/include/private/android_filesystem_capability.h
deleted file mode 120000
index f310b35..0000000
--- a/include/private/android_filesystem_capability.h
+++ /dev/null
@@ -1 +0,0 @@
-../../libcutils/include/private/android_filesystem_capability.h
\ No newline at end of file

include/private/canned_fs_config.h

diff --git a/include/private/canned_fs_config.h b/include/private/canned_fs_config.h
deleted file mode 120000
index 8f92b2d..0000000
--- a/include/private/canned_fs_config.h
+++ /dev/null
@@ -1 +0,0 @@
-../../libcutils/include/private/canned_fs_config.h
\ No newline at end of file

include/private/fs_config.h

diff --git a/include/private/fs_config.h b/include/private/fs_config.h
deleted file mode 100644
index e9868a4..0000000
--- a/include/private/fs_config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// 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.