Skip to content
Snippets Groups Projects
Commit 1e3f7983 authored by Patrick Rohr's avatar Patrick Rohr
Browse files

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
parent 00e8b19a
No related branches found
No related tags found
No related merge requests found
......@@ -27,14 +27,6 @@ cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsDisabled"
// 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 {
java_defaults {
name: "CronetJavaDefaultsEnabled",
srcs: cronet_java_defaults_enabled_srcs,
srcs: [":cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment