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

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

Merge "Use Guava built from source in tools." am: 927a9ea7 am: b1e981dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134



Change-Id: I4b3861bcdd953f78a209063140d9fa19be7ac9df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30919118 b1e981dd

tools/locked_region_code_injection/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ java_binary_host { 
        "asm-commons-9.2",

        "asm-tree-9.2",

        "asm-analysis-9.2",

        "guava-21.0",

        "guava",

    ],

}

tools/traceinjection/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ java_binary_host { 
        "asm-commons-9.2",

        "asm-tree-9.2",

        "asm-analysis-9.2",

        "guava-21.0",

        "guava",

    ],

}