commit 2ab89489df341de1b4f06184b81aa3f8c5b02092
author android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> Wed Jul 28 10:04:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 28 10:04:49 2021 +0000
tree 9962e6d57c629e94d9ff810f468356672d24581e
parent 895f3417f7ea4505104373c12b0aca6a9e80f0ab
parent 4c3e76ca672a77af3190f7ec3590d98bf6afd929

DO NOT MERGE Drop prebuilt files to android source tree. am: 4c3e76ca67

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15388710

Change-Id: I4001c608b4f969f945ab85aacc2771192b2e56c8

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..8b6675a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+include platform/packages/modules/common:/OWNERS

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 04c1eae..515c7f2 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,16 +6,6 @@
     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",
@@ -39,14 +29,9 @@
     },
 }
 
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
     name: "com.android.conscrypt-bootclasspath-fragment",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//external/conscrypt:__subpackages__"],
     apex_available: ["com.android.conscrypt"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
@@ -87,14 +72,9 @@
     ],
 }
 
-module_java_import {
+java_import {
     name: "conscrypt",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: [
         "//device:__subpackages__",
         "//external/conscrypt:__subpackages__",
@@ -116,10 +96,10 @@
     name: "conscrypt-module-sdk_conscrypt.module.public.api@current",
     sdk_member_name: "conscrypt.module.public.api",
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//frameworks/base",
         "//frameworks/base/api",
-        "//libcore",
         "//packages/modules/IPsec",
         "//packages/modules/common/sdk",
         "//prebuilts:__subpackages__",
@@ -136,19 +116,14 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "conscrypt.module.public.api",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//frameworks/base",
         "//frameworks/base/api",
-        "//libcore",
         "//packages/modules/IPsec",
         "//packages/modules/common/sdk",
         "//prebuilts:__subpackages__",
@@ -169,9 +144,9 @@
     name: "conscrypt-module-sdk_conscrypt.module.platform.api@current",
     sdk_member_name: "conscrypt.module.platform.api",
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//external/wycheproof",
-        "//libcore:__subpackages__",
         "//prebuilts:__subpackages__",
     ],
     apex_available: ["//apex_available:platform"],
@@ -186,18 +161,13 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "conscrypt.module.platform.api",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//external/wycheproof",
-        "//libcore:__subpackages__",
         "//prebuilts:__subpackages__",
     ],
     apex_available: ["//apex_available:platform"],
@@ -233,14 +203,9 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "conscrypt.module.intra.core.api",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: [
         "//external/conscrypt",
         "//external/okhttp",
@@ -316,14 +281,9 @@
     },
 }
 
-module_cc_prebuilt_library_shared {
+cc_prebuilt_library_shared {
     name: "libconscrypt_jni",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//external/conscrypt:__subpackages__"],
     apex_available: ["//apex_available:platform"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],