Skip to content
Snippets Groups Projects
Commit 6552f6b3 authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 3011d982...

Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 3011d982 am: 8f7ce36e am: 314e88c5

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/1907887

Change-Id: I9f3fd0434861cf252cbe2874134096995303ee84
parents 121abdd4 314e88c5
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,14 @@ package { ...@@ -6,6 +6,14 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], 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 { prebuilt_bootclasspath_fragment {
name: "sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current", name: "sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current",
sdk_member_name: "com.android.sdkext-bootclasspath-fragment", sdk_member_name: "com.android.sdkext-bootclasspath-fragment",
...@@ -22,9 +30,14 @@ prebuilt_bootclasspath_fragment { ...@@ -22,9 +30,14 @@ prebuilt_bootclasspath_fragment {
}, },
} }
prebuilt_bootclasspath_fragment { module_prebuilt_bootclasspath_fragment {
name: "com.android.sdkext-bootclasspath-fragment", name: "com.android.sdkext-bootclasspath-fragment",
prefer: false, prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
},
visibility: ["//packages/modules/SdkExtensions:__subpackages__"], visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
apex_available: ["com.android.sdkext"], apex_available: ["com.android.sdkext"],
licenses: ["sdkextensions-sdk_Android-Apache-2.0"], licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
...@@ -75,9 +88,14 @@ java_sdk_library_import { ...@@ -75,9 +88,14 @@ java_sdk_library_import {
}, },
} }
java_sdk_library_import { module_java_sdk_library_import {
name: "framework-sdkextensions", name: "framework-sdkextensions",
prefer: false, prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
},
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: [ apex_available: [
"com.android.sdkext", "com.android.sdkext",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment