43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From b57beea457526bbc2243398ffe9b216cbdb9f959 Mon Sep 17 00:00:00 2001
|
|
From: Motomu Utsumi <motomuman@google.com>
|
|
Date: Fri, 27 Jan 2023 15:29:14 +0900
|
|
Subject: [PATCH] cronet: Remove androidx dependency for cronet build
|
|
|
|
base_java doesn't use androidx_core_core if is_cronet_build is true.
|
|
So, androidx_core_core can be removed from the deps if is_cronet_build
|
|
is true.
|
|
This change depends on local patch aosp/2369503
|
|
|
|
Test: m
|
|
Bug: 265913942
|
|
Change-Id: Icb251c4c4446aa3b072312e722fa4241ba96f847
|
|
---
|
|
base/BUILD.gn | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
|
index 02c76108..bbb43cae 100644
|
|
--- a/base/BUILD.gn
|
|
+++ b/base/BUILD.gn
|
|
@@ -4208,10 +4208,15 @@ if (is_android) {
|
|
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
|
|
"//third_party/androidx:androidx_annotation_annotation_experimental_java",
|
|
"//third_party/androidx:androidx_annotation_annotation_java",
|
|
- "//third_party/androidx:androidx_collection_collection_java",
|
|
- "//third_party/androidx:androidx_core_core_java",
|
|
]
|
|
|
|
+ if (!is_cronet_build) {
|
|
+ deps += [
|
|
+ "//third_party/androidx:androidx_collection_collection_java",
|
|
+ "//third_party/androidx:androidx_core_core_java",
|
|
+ ]
|
|
+ }
|
|
+
|
|
sources = [
|
|
"android/java/src/org/chromium/base/ActivityState.java",
|
|
"android/java/src/org/chromium/base/ApiCompatibilityUtils.java",
|
|
--
|
|
2.39.1.456.gfc5497dd1b-goog
|
|
|