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

Commit fed51b51 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6416172 from af9240ab to rvc-release 

Change-Id: I97a1693cc498ba4741c225b8e6a832975d05392a
parents 33f0999a af9240ab

adb/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -425,6 +425,15 @@ cc_library_static { 
            ],

        }

    },



    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    visibility: [

        "//bootable/recovery/minadbd",

        "//system/core/adb",

    ],

}



cc_library {
@@ -492,12 +501,22 @@ cc_library { 
            ],

        },

    },



    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    visibility: [

        "//system/core/adb",

    ],



}



cc_library {

    name: "libadbd",

    defaults: ["adbd_defaults", "host_adbd_supported"],

    recovery_available: true,

    apex_available: ["com.android.adbd"],



    // avoid getting duplicate symbol of android::build::getbuildnumber().

    use_version_lib: false,
@@ -550,6 +569,7 @@ cc_binary { 
    defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],

    stl: "libc++_static",

    recovery_available: true,

    apex_available: ["com.android.adbd"],



    srcs: [

        "daemon/main.cpp",

adb/libs/adbconnection/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ cc_library { 
    use_version_lib: false,



    recovery_available: true,

    apex_available: [

        "com.android.adbd",

        // TODO(b/151398197) remove the below

        "//apex_available:platform",

    ],

    compile_multilib: "both",

}

base/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ cc_library_headers { 
            enabled: true,

        },

    },

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}



cc_defaults {

diagnose_usb/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ cc_library_static { 
    cflags: ["-Wall", "-Wextra", "-Werror"],

    host_supported: true,

    recovery_available: true,

    apex_available: [

        "com.android.adbd",

        // TODO(b/151398197) remove the below

        "//apex_available:platform",

    ],

    target: {

        windows: {

            enabled: true,

init/mount_namespace.cpp

+7 −1
Original line number Diff line number Diff line
@@ -240,14 +240,20 @@ bool SetupMountNamespaces() { 
    // slave to the /mnt/user mount, and at the same time /mnt/installer in the

    // bootstrap namespace shares a peer group with /mnt/installer in the

    // default namespace.

    // /mnt/androidwritable is similar to /mnt/installer but serves for

    // MOUNT_EXTERNAL_ANDROID_WRITABLE apps.

    if (!mkdir_recursive("/mnt/user", 0755)) return false;

    if (!mkdir_recursive("/mnt/installer", 0755)) return false;

    if (!mkdir_recursive("/mnt/androidwritable", 0755)) return false;

    if (!(BindMount("/mnt/user", "/mnt/installer", true))) return false;

    // First, make /mnt/installer a slave bind mount

    if (!(BindMount("/mnt/user", "/mnt/androidwritable", true))) return false;

    // First, make /mnt/installer and /mnt/androidwritable a slave bind mount

    if (!(MakeSlave("/mnt/installer"))) return false;

    if (!(MakeSlave("/mnt/androidwritable"))) return false;

    // Then, make it shared again - effectively creating a new peer group, that

    // will be inherited by new mount namespaces.

    if (!(MakeShared("/mnt/installer"))) return false;

    if (!(MakeShared("/mnt/androidwritable"))) return false;



    bootstrap_ns_fd.reset(OpenMountNamespace());

    bootstrap_ns_id = GetMountNamespaceId();