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

Commit 1efb9d2e authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

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

am: f8d22dec

Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7
parents d6f00d85 f8d22dec

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,

}