Merge "Declare CronetApexDefaults with soong variable" am: 1aa9963d76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2248633
Change-Id: I950431fba6e41edef736240f8dbbd542fee5f9f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Cronet/apex/Android.bp b/Cronet/apex/Android.bp
index 1ac370d..2c5b481 100644
--- a/Cronet/apex/Android.bp
+++ b/Cronet/apex/Android.bp
@@ -16,6 +16,28 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+// CronetApexDefaults uses apex_defaults cronet_apex_defaults specifies. cronet_apex_defaults
+// could be "CronetApexDefaultsEnabled" or "CronetApexDefaultsDisabled" depending on the branch.
+cronet_apex_defaults = "CronetApexDefaultsEnabled"
+// This is a placeholder comment to avoid merge conflicts
+// as cronet_apex_defaults may have different values
+// depending on the branch
+
+apex_defaults {
+ name: "CronetApexDefaults",
+ defaults: [cronet_apex_defaults],
+}
+
+apex_defaults {
+ name: "CronetApexDefaultsEnabled",
+ jni_libs: ["libcronet.80.0.3986.0"],
+ java_libs: ["org.chromium.net.cronet"],
+}
+
+apex_defaults {
+ name: "CronetApexDefaultsDisabled",
+}
+
apex_defaults {
name: "com.android.cronet-defaults",
compile_multilib: "both",