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

Commit d66e442c authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "ramdisk" 

* changes:
  Add e2fsck to fs_config
  Make ramdisk_available.
parents be27975f 04b932b8

base/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ cc_defaults { 
cc_library_headers {

    name: "libbase_headers",

    vendor_available: true,

    ramdisk_available: true,

    recovery_available: true,

    host_supported: true,

    native_bridge_supported: true,
@@ -112,6 +113,7 @@ cc_library { 
    name: "libbase",

    defaults: ["libbase_defaults"],

    vendor_available: true,

    ramdisk_available: true,

    recovery_available: true,

    host_supported: true,

    native_bridge_supported: true,

libcutils/fs_config.cpp

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static const struct fs_path_config android_files[] = { 
    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) |

                                           CAP_MASK_LONG(CAP_SETGID),

                                              "system/bin/simpleperf_app_runner" },

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/e2fsck" },

    // generic defaults

    { 00755, AID_ROOT,      AID_ROOT,      0, "bin/*" },

    { 00640, AID_ROOT,      AID_SHELL,     0, "fstab.*" },

liblog/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ cc_library_headers { 
    name: "liblog_headers",

    host_supported: true,

    vendor_available: true,

    ramdisk_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    export_include_dirs: ["include"],
@@ -62,6 +63,7 @@ cc_library_headers { 
cc_library {

    name: "liblog",

    host_supported: true,

    ramdisk_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    srcs: liblog_sources,

libsparse/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
cc_library {

    name: "libsparse",

    host_supported: true,

    ramdisk_available: true,

    recovery_available: true,

    unique_host_soname: true,

    srcs: [

property_service/libpropertyinfoparser/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ cc_library_static { 
    name: "libpropertyinfoparser",

    host_supported: true,

    vendor_available: true,

    ramdisk_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    srcs: ["property_info_parser.cpp"],