Merge "cronet: Introduce constant for CronetJavaDefaultsEnabled srcs" am: c5fdba7f3f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2390558 Change-Id: Ib5517a326ddb04ad28e5cdcaf17e9efdf85adb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
d4fb364ca3
1 changed files with 8 additions and 0 deletions
|
|
@ -29,6 +29,14 @@ 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 = [":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"],
|
||||
|
|
|
|||
Loading…
Reference in a new issue