cronet: remove cronet_java_defaults_enabled_srcs
external/cronet has been added to the default manifest in
tm-mainline-prod, so this soong variable is not needed anymore.
Merged-In line is from an unrelated change to prevent this from being
merged into git_master. A separate change will be merged in aosp-master
and will then automerge into git_master.
Test: TH
Merged-In: I8e2a4b76c09c7f11c01f125bf7f48d04aa897393
Change-Id: I5750d87c9cab0e9d4d213b5a81a2d71cc9610a08
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index ba9765c..7e9e868 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 = []
-// 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",
],