Skip to content

Commit

Permalink
Reland "Reland "Android: turning on bytecode checker""
Browse files Browse the repository at this point in the history
This is a reland of ba0225d

Fixed the build breakage downstream
TBR=reland
Original change's description:
> Reland "Android: turning on bytecode checker"
>
> This is a reland of 0301a79
>
> 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/1318071
> Reviewed-by: Sam Maier <smaier@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#605347}

Bug: 874854
Change-Id: I7d9cecced393853e9bfe2e6d9f5b184f6c9f1ffc
Reviewed-on: https://chromium-review.googlesource.com/c/1320930
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605858}
  • Loading branch information
Sam Maier authored and Commit Bot committed Nov 6, 2018
1 parent d2f6756 commit ed88686
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build/config/android/internal_rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions components/data_reduction_proxy/core/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ mojom("interfaces") {
]

deps = [
"//mojo/public/mojom/base",
"//services/network/public/mojom",
]
}
1 change: 1 addition & 0 deletions content/public/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions third_party/byte_buddy/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down

0 comments on commit ed88686

Please sign in to comment.