summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBowgo Tsai2017-05-15 03:34:52 -0500
committerBowgo Tsai2017-05-15 03:49:08 -0500
commit1fa0251930371aa0069e6ea20602b604c02f4f48 (patch)
treec7dd2b7e9799f871c1e6d07bddccb2b607851cc7
parenta7172f41b8ccb82d04e3317bb84a46b19d8c008d (diff)
downloadplatform-system-core-1fa0251930371aa0069e6ea20602b604c02f4f48.tar.gz
platform-system-core-1fa0251930371aa0069e6ea20602b604c02f4f48.tar.xz
platform-system-core-1fa0251930371aa0069e6ea20602b604c02f4f48.zip
init: moving get_block_device_symlinks() to public API
This is required for init to get by-name symlinks in the first stage mount with AVB. Bug: 37552224 Test: first stage mount /vendor with vboot 2.0 (AVB) Change-Id: Ib067753f651ecea4d4d26215da9294f1c607d95e Merged-In: Ia0f290542eb1cffce5ae876dfedb453dde960253
-rw-r--r--init/devices.cpp3
-rw-r--r--init/devices.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/init/devices.cpp b/init/devices.cpp
index 405f92e17..39571ac65 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -526,8 +526,7 @@ err:
526 return NULL; 526 return NULL;
527} 527}
528 528
529static char **get_block_device_symlinks(struct uevent *uevent) 529char** get_block_device_symlinks(struct uevent* uevent) {
530{
531 const char *device; 530 const char *device;
532 struct platform_node *pdev; 531 struct platform_node *pdev;
533 const char *slash; 532 const char *slash;
diff --git a/init/devices.h b/init/devices.h
index 26a064bac..3f2cde4c3 100644
--- a/init/devices.h
+++ b/init/devices.h
@@ -55,4 +55,6 @@ extern int add_dev_perms(const char *name, const char *attr,
55 unsigned short wildcard); 55 unsigned short wildcard);
56int get_device_fd(); 56int get_device_fd();
57 57
58char** get_block_device_symlinks(struct uevent* uevent);
59
58#endif /* _INIT_DEVICES_H */ 60#endif /* _INIT_DEVICES_H */