diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-12-02 21:36:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-02 21:36:22 +0000 |
| commit | eddd1cf15a8610652c33a9cba6bbbc4f953b689c (patch) | |
| tree | bb28f1ce3c58cc9a2e00f29be6044c32fb6aed3b | |
| parent | e1ef7a205cee6b763c1df662e9aa2da6ff79a0fd (diff) | |
| parent | 8736a76811e406327178a0818f97677e6ffe82ea (diff) | |
| download | StatsD-eddd1cf15a8610652c33a9cba6bbbc4f953b689c.tar.gz | |
Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 5a5367588d am: 4f20ab4153 am: 8edae27689 am: 8736a76811
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/1907884
Change-Id: I6b2d2ab2dd020c01e7a9ebc57acee2fb415a225f
| -rw-r--r-- | current/Android.bp | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/current/Android.bp b/current/Android.bp index a6d2144..f47f137 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -6,6 +6,15 @@ package { 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_sdk_library_import", + "module_prebuilt_bootclasspath_fragment", + ], +} + prebuilt_bootclasspath_fragment { name: "statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current", sdk_member_name: "com.android.os.statsd-bootclasspath-fragment", @@ -23,9 +32,14 @@ prebuilt_bootclasspath_fragment { }, } -prebuilt_bootclasspath_fragment { +module_prebuilt_bootclasspath_fragment { name: "com.android.os.statsd-bootclasspath-fragment", prefer: false, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: ["com.android.os.statsd"], licenses: ["statsd-module-sdk_Android-Apache-2.0"], @@ -76,9 +90,14 @@ java_sdk_library_import { }, } -java_sdk_library_import { +module_java_sdk_library_import { name: "framework-statsd", prefer: false, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: [ "com.android.os.statsd", @@ -163,9 +182,14 @@ cc_prebuilt_library_shared { }, } -cc_prebuilt_library_shared { +module_cc_prebuilt_library_shared { name: "libstatssocket", prefer: false, + soong_config_variables: { + module_build_from_source: { + prefer: false, + }, + }, visibility: ["//visibility:public"], apex_available: [ "com.android.bluetooth.updatable", |