Move uprobestats into Mainline
Ignore-AOSP-First: uprobestats is an internal only module.
Bug: 355315669
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && m
Change-Id: I6f38a47dd91de68f7d4a72a1f11d2431120fb8f1
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 48610a7..0cd2959 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -736,6 +736,11 @@
"AvatarPicker", // generic_system (RELEASE_AVATAR_PICKER_APP)
],
default: [],
+ }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+ true: [
+ "com.android.uprobestats", // base_system (RELEASE_UPROBESTATS_MODULE)
+ ],
+ default: [],
}),
},
prefer32: {
@@ -750,8 +755,12 @@
"android.system.virtualizationservice-ndk",
"libgsi",
"servicemanager",
- "uprobestats", // base_system - internal
- ],
+ ] + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+ true: [],
+ default: [
+ "uprobestats", // base_system internal
+ ],
+ }),
},
both: {
deps: [
@@ -853,7 +862,6 @@
"libstdc++", // base_system
"libsysutils", // base_system
"libui", // base_system
- "libuprobestats_client", // base_system - internal
"libusbhost", // base_system
"libutils", // base_system
"libvendorsupport", // llndk library
@@ -869,6 +877,11 @@
}) + select(soong_config_variable("ANDROID", "TARGET_DYNAMIC_64_32_MEDIASERVER"), {
"true": ["mediaserver"],
default: [],
+ }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+ true: [],
+ default: [
+ "libuprobestats_client", // base_system internal
+ ],
}),
},
},