diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-28 05:54:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-28 05:54:08 +0000 |
| commit | abb53bd32c13a8961c68a94c159099e2f354c549 (patch) | |
| tree | b32d094625df6889a5121842b62149430258227e | |
| parent | 5237b8ac3b292bbbefd6849b8ef1585d97fc0eb4 (diff) | |
| parent | ffb22f3d4f74c702702d326cf901b69f60fce322 (diff) | |
| download | recovery-pie-gsi.tar.gz | |
Merge "Move bootctrl.default to /vendor" into pie-gsipie-gsi
| -rw-r--r-- | boot_control/Android.mk | 9 | ||||
| -rw-r--r-- | bootloader_message/Android.bp | 21 | ||||
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 2 |
3 files changed, 24 insertions, 8 deletions
diff --git a/boot_control/Android.mk b/boot_control/Android.mk index 9814d712..285f707a 100644 --- a/boot_control/Android.mk +++ b/boot_control/Android.mk @@ -25,9 +25,10 @@ LOCAL_CFLAGS := \ -Werror \ -Wall \ -Wextra -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr libbase +LOCAL_SHARED_LIBRARIES := libhardware libbase liblog +LOCAL_STATIC_LIBRARIES := libbootloader_message_vendor libfstab +LOCAL_VENDOR_MODULE := true LOCAL_POST_INSTALL_CMD := \ - $(hide) mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/hw && \ - ln -sf bootctrl.bcb.so $(TARGET_OUT_SHARED_LIBRARIES)/hw/bootctrl.default.so + $(hide) mkdir -p $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw && \ + ln -sf bootctrl.bcb.so $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw/bootctrl.default.so include $(BUILD_SHARED_LIBRARY) diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index c81c67bd..b18cb798 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -14,8 +14,8 @@ // limitations under the License. // -cc_library_static { - name: "libbootloader_message", +cc_defaults { + name: "libbootloader_message_defaults", srcs: ["bootloader_message.cpp"], cflags: [ "-Wall", @@ -23,7 +23,22 @@ cc_library_static { ], static_libs: [ "libbase", - "libfs_mgr", + "libfstab", ], export_include_dirs: ["include"], } + +cc_library_static { + name: "libbootloader_message", + defaults: [ + "libbootloader_message_defaults", + ], +} + +cc_library_static { + name: "libbootloader_message_vendor", + defaults: [ + "libbootloader_message_defaults", + ], + vendor: true, +} diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index aaeffdc5..37f84849 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -27,7 +27,7 @@ #include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/unique_fd.h> -#include <fs_mgr.h> +#include <fstab/fstab.h> static std::string get_misc_blk_device(std::string* err) { std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(), |