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

Commit b1463ada authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I3a2191b0,Ide1056b5 am: af13a8b7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1409690

Change-Id: I5be6adf25166b6597de3b792f4da7212acd3d009
parents ebd6a0f3 af13a8b7

adb/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,8 @@ cc_library { 
    host_supported: true,

    compile_multilib: "both",

    min_sdk_version: "apex_inherit",

    // This library doesn't use build::GetBuildNumber()

    use_version_lib: false,



    srcs: [

        "sysdeps/env.cpp",

fastboot/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ cc_library_host_static { 
        darwin: {

            srcs: ["usb_osx.cpp"],

        },

        linux_glibc: {

        linux: {

            srcs: ["usb_linux.cpp"],

        },

    },