Merge "cronet: remove cronet_java_defaults_enabled_srcs" am: fa482c992f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2400019
Change-Id: I818e038c46ad36b4a0180595ce7da7592aa5bebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index cbdf0c0..4c677d0 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -27,14 +27,6 @@
// as cronet_defaults may have different values
// depending on the branch
-// cronet_java_defaults_enabled_srcs is used to specify the srcs of CronetJavaDefaultsEnabled
-// This is required until the external/cronet is auto-merged to tm-mainline-prod and
-// :cronet_aml_api_sources is available
-cronet_java_defaults_enabled_srcs = [":cronet_aml_api_sources"]
-// This is a placeholder comment to avoid merge conflicts
-// as cronet_defaults may have different values
-// depending on the branch
-
java_sdk_library {
name: "framework-tethering",
defaults: [
@@ -82,7 +74,7 @@
java_defaults {
name: "CronetJavaDefaultsEnabled",
- srcs: cronet_java_defaults_enabled_srcs,
+ srcs: [":cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],