Commit ba0225d1 authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Reland "Android: turning on bytecode checker"

This is a reland of 0301a791

I don't think this would have caused a runtime chromeos error, since it's
a build time android change. If it pops up again that I broke the test,
I will investigate further.

TBR=retry

Original change's description:
> Android: turning on bytecode checker
>
> This arg was defaulting to false when it should have defaulted to true.
>
> TBR=turning off bytecode checks for certain dirs
>
> Bug: 874854
> Change-Id: I248ccab0ed52079106b07e43a302927bfa4414c8
> Reviewed-on: https://chromium-review.googlesource.com/c/1309973
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#605068}

Bug: 874854
Change-Id: Idc95750d4465ca53b72db26a98ce74724fe21968
Reviewed-on: https://chromium-review.googlesource.com/c/1318071Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605347}
parent 19dbd8d3
......@@ -1418,7 +1418,7 @@ if (enable_java_templates) {
_enable_bytecode_rewriter =
_enable_assert || _enable_custom_resources || _enable_thread_annotations
_is_prebuilt = defined(invoker.is_prebuilt) && invoker.is_prebuilt
_enable_bytecode_checks = defined(invoker.enable_bytecode_checks) &&
_enable_bytecode_checks = !defined(invoker.enable_bytecode_checks) ||
invoker.enable_bytecode_checks
# Release builds don't have asserts enabled, so they often will not run the
......
......@@ -127,6 +127,7 @@ mojom("interfaces") {
]
deps = [
"//mojo/public/mojom/base",
"//services/network/public/mojom",
]
}
......@@ -450,6 +450,7 @@ android_library("content_javatests") {
"//third_party/android_support_test_runner:runner_java",
"//third_party/blink/public:android_mojo_bindings_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
"//ui/android:ui_java",
......
......@@ -7,17 +7,20 @@ import("//build/config/android/rules.gni")
java_prebuilt("byte_buddy_java") {
supports_android = true
testonly = true
enable_bytecode_checks = false
jar_path = "lib/byte-buddy.jar"
}
java_prebuilt("byte_buddy_agent_java") {
supports_android = true
testonly = true
enable_bytecode_checks = false
jar_path = "lib/byte-buddy-agent.jar"
}
android_java_prebuilt("byte_buddy_android_java") {
testonly = true
enable_bytecode_checks = false
deps = [
"//third_party/android_tools:dx_25_0_2_java",
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment