From b9f4bf29d039cf14972afc7b7bb3920add124d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Mon, 12 Mar 2018 14:19:23 +0100 Subject: [PATCH] Remove build hooks implementation from AAR-builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is unnecessary to include the build hooks implementation because we don't use them. It was also causing errors because the interface the class implements is not included in the AAR. Also removes comments about re-enabling build hooks because it has grown into something very Chromium specific and it is unlikely that we want to re-enable them. Bug: webrtc:8964, webrtc:8168 Change-Id: Ia95af13e90a5511554305d2688ced820e9914beb Reviewed-on: https://webrtc-review.googlesource.com/61302 Reviewed-by: Patrik Höglund Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#22386} --- sdk/android/BUILD.gn | 1 + webrtc.gni | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 64708fad96..0c25f0295b 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -617,6 +617,7 @@ dist_jar("libwebrtc") { direct_deps_only = true use_unprocessed_jars = true requires_android = true + no_build_hooks = true deps = [ ":libjingle_peerconnection_java", diff --git a/webrtc.gni b/webrtc.gni index f32e490f7b..f48fce7b9a 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -495,7 +495,6 @@ if (is_android) { # Treat warnings as errors. javac_args = [ "-Werror" ] - # TODO(sakal): Fix build hooks crbug.com/webrtc/8168 no_build_hooks = true } } @@ -514,7 +513,6 @@ if (is_android) { # Treat warnings as errors. javac_args = [ "-Werror" ] - # TODO(sakal): Fix build hooks crbug.com/webrtc/8168 no_build_hooks = true } } @@ -533,7 +531,6 @@ if (is_android) { # Treat warnings as errors. javac_args = [ "-Werror" ] - # TODO(sakal): Fix build hooks crbug.com/webrtc/8168 no_build_hooks = true } }