From 841643a95eb406bb51ca06bd48c89c6f97d7ca33 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Tue, 17 Jan 2023 14:51:46 +0900 Subject: [PATCH] cronet: Introduce constant for CronetJavaDefaultsEnabled srcs This is required temporarily until the external/cronet is auto-merged to tm-mainline-prod Test: m Change-Id: Ie875e4108a0b2a82e9615d1f32f3b0bf76572146 --- Tethering/common/TetheringLib/Android.bp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index 6df522ca36..11978cb06f 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -29,6 +29,14 @@ cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled" // 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: ["framework-tethering-defaults"],