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

Commit 81d8372c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pin jarjar targets to java_version 1.8." am: 2bbf12aa am:... 

Merge "Merge "Pin jarjar targets to java_version 1.8." am: 2bbf12aa am: 3f48e869 am: be3a1099"
parents 6530c96b 12afc7fd

proto/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ java_library_static { 
    },

    srcs: ["src/**/*.proto"],

    no_framework_libs: true,

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

    target: {

        android: {

            jarjar_rules: "jarjar-rules.txt",

test-base/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ java_library { 


    srcs: ["src/**/*.java"],



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",



    no_framework_libs: true,

    hostdex: true,

    libs: [
@@ -55,13 +58,14 @@ java_library_static { 
    name: "repackaged.android.test.base",



    static_libs: ["android.test.base"],



    no_framework_libs: true,

    libs: [

        "framework",

    ],



    jarjar_rules: "jarjar-rules.txt",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

}



// Build the android.test.base-minus-junit library

test-mock/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
java_library {

    name: "android.test.mock",



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",

    srcs: ["src/**/*.java"],



    no_framework_libs: true,
@@ -35,4 +37,6 @@ java_library_static { 
    static_libs: ["android.test.mock"],



    jarjar_rules: "jarjar-rules.txt",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

}

test-runner/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
java_library {

    name: "android.test.runner",



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",

    srcs: ["src/**/*.java"],



    no_framework_libs: true,
@@ -55,4 +57,6 @@ java_library_static { 
    static_libs: ["android.test.runner"],



    jarjar_rules: "jarjar-rules.txt",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

}