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

Commit f8d22dec authored by David Brazdil's avatar David Brazdil
Browse files

resolve merge conflicts of 6e3c86c8 to stage-aosp-master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8
parents d7647c1b 6e3c86c8

test-base/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -117,4 +117,5 @@ java_library_static { 
        },

    },

    sdk_version: "current",

    compile_dex: true,

}

test-mock/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ java_library_static { 
            enabled: false,

        },

    },

    compile_dex: true,

}



java_library_static {
@@ -105,4 +106,5 @@ java_library_static { 
            enabled: false,

        },

    },

    compile_dex: true,

}

test-runner/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -121,4 +121,5 @@ java_library_static { 
        },

    },

    sdk_version: "current",

    compile_dex: true,

}