commit 786b1bc874ccb026133e079b357e56881a0c593c
author Adam Seaton <aseaton@google.com> Thu Aug 19 19:14:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 19 19:14:25 2021 +0000
tree 53cd83de747afcfef3661cad72b62cedf434207d
parent 5cd67a26748334fc470223a79cc2ad5c29d65cec
parent fb66b78c500e6f3fc1b7e24180ffd96b7a6ac283

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

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

Change-Id: I8f9297ba66ee2b592249e5eb0fdfc3e71c4c7639

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 529455d..e4e05e6 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-    ],
-}
-
 prebuilt_bootclasspath_fragment {
     name: "permission-module-sdk_com.android.permission-bootclasspath-fragment@current",
     sdk_member_name: "com.android.permission-bootclasspath-fragment",
@@ -33,14 +25,9 @@
     },
 }
 
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
     name: "com.android.permission-bootclasspath-fragment",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: ["com.android.permission"],
     licenses: ["permission-module-sdk_Android-Apache-2.0"],
@@ -94,14 +81,9 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "framework-permission",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.permission",
@@ -174,14 +156,9 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "framework-permission-s",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.permission",
@@ -243,14 +220,9 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "service-permission",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.permission",