commit 5a1a2a4cef5e379cc0a76146765007169acaad5d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 04 02:09:10 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 04 02:09:10 2021 +0000
tree aa5c11c71bc2b094358b15c10b4d2a5340577398
parent 72c6237ffb14c0ff9677bfe266c90b892e2a9feb
parent 748cbdb0b707533f331aa321b41c3edab668acae

Snap for 7968112 from 748cbdb0b707533f331aa321b41c3edab668acae to sc-v2-release

Change-Id: I62ae03fcae1248a0fa3d15599998a11dfa485931

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 73207dc..b46343d 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,6 +6,16 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_cc_prebuilt_library_shared",
+        "module_java_import",
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "conscrypt-module-sdk_com.android.conscrypt-bootclasspath-fragment@current",
     sdk_member_name: "com.android.conscrypt-bootclasspath-fragment",
@@ -29,9 +39,14 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.conscrypt-bootclasspath-fragment",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//external/conscrypt:__subpackages__"],
     apex_available: ["com.android.conscrypt"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
@@ -72,9 +87,14 @@
     ],
 }
 
-java_import {
+module_java_import {
     name: "conscrypt",
     prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: [
         "//device:__subpackages__",
         "//external/conscrypt:__subpackages__",
@@ -116,9 +136,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "conscrypt.module.public.api",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: [
         "//external/conscrypt",
         "//frameworks/base",
@@ -161,9 +186,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "conscrypt.module.platform.api",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: [
         "//external/conscrypt",
         "//external/wycheproof",
@@ -203,9 +233,14 @@
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "conscrypt.module.intra.core.api",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: [
         "//external/conscrypt",
         "//external/okhttp",
@@ -281,9 +316,14 @@
     },
 }
 
-cc_prebuilt_library_shared {
+module_cc_prebuilt_library_shared {
     name: "libconscrypt_jni",
     prefer: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//external/conscrypt:__subpackages__"],
     apex_available: ["//apex_available:platform"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],