Commit ec271272 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Chromium LUCI CQ

[Build] Use doubledown version of Dagger2 part 2/5

This CL configures
//third_party:dagger_java
//third_party:dagger_processor
so that they can point to the internal implementation of Dagger2
for internal Chrome builds

BUG=1141111

Change-Id: Ibe7bc24341afcaad4835bf7a60093f563d65de5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2565192Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831994}
parent 4a337b92
...@@ -129,6 +129,16 @@ if (is_android || is_chromeos || ...@@ -129,6 +129,16 @@ if (is_android || is_chromeos ||
} }
} }
if (!defined(dagger_java_target)) {
dagger_java_target =
"//third_party/android_deps:com_google_dagger_dagger_java"
}
if (!defined(dagger_annotation_processor_target)) {
dagger_annotation_processor_target =
"//third_party/android_deps:com_google_dagger_dagger_compiler_java"
}
if (!defined(guava_android_target)) { if (!defined(guava_android_target)) {
guava_android_target = guava_android_target =
"//third_party/android_deps:com_google_guava_guava_android_java" "//third_party/android_deps:com_google_guava_guava_android_java"
......
...@@ -506,8 +506,8 @@ android_library("chrome_java") { ...@@ -506,8 +506,8 @@ android_library("chrome_java") {
"//third_party/android_deps:androidx_viewpager_viewpager_java", "//third_party/android_deps:androidx_viewpager_viewpager_java",
"//third_party/android_deps:chromium_play_services_availability_java", "//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_dagger_dagger_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java", "//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:dagger_java",
"//third_party/android_deps:javax_inject_javax_inject_java", "//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_deps:material_design_java", "//third_party/android_deps:material_design_java",
"//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/android_deps:protobuf_lite_runtime_java",
...@@ -920,8 +920,8 @@ junit_binary("chrome_junit_tests") { ...@@ -920,8 +920,8 @@ junit_binary("chrome_junit_tests") {
"//third_party/android_deps:androidx_test_core_java", "//third_party/android_deps:androidx_test_core_java",
"//third_party/android_deps:androidx_test_runner_java", "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:chromium_play_services_availability_shadows_java", "//third_party/android_deps:chromium_play_services_availability_shadows_java",
"//third_party/android_deps:com_google_dagger_dagger_java",
"//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java", "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
"//third_party/android_deps:dagger_java",
"//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java", "//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:rules_java",
......
...@@ -28,6 +28,15 @@ java_group("android_support_v7_appcompat_java") { ...@@ -28,6 +28,15 @@ java_group("android_support_v7_appcompat_java") {
] ]
} }
java_group("dagger_java") {
deps = [ dagger_java_target ]
}
java_annotation_processor("dagger_processor") {
main_class = "dagger.internal.codegen.ComponentProcessor"
deps = [ dagger_annotation_processor_target ]
}
java_group("espresso_java") { java_group("espresso_java") {
testonly = true testonly = true
...@@ -79,11 +88,6 @@ java_annotation_processor("auto_service_processor") { ...@@ -79,11 +88,6 @@ java_annotation_processor("auto_service_processor") {
deps = [ ":com_google_auto_service_auto_service_java" ] deps = [ ":com_google_auto_service_auto_service_java" ]
} }
java_annotation_processor("dagger_processor") {
main_class = "dagger.internal.codegen.ComponentProcessor"
deps = [ ":com_google_dagger_dagger_compiler_java" ]
}
android_library("chromium_play_services_availability_java") { android_library("chromium_play_services_availability_java") {
sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ] sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
deps = [ "$google_play_services_package:google_play_services_base_java" ] deps = [ "$google_play_services_package:google_play_services_base_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