Skip to content
Snippets Groups Projects
Commit 85e2fab7 authored by Colin Cross's avatar Colin Cross
Browse files

Remove test_com.android.os.statsd from apex_available

In order to simplify the apex logic in Soong, avoid needing to mention
test apexes in apex_available by setting apex_available_name in the
test apex to masquerade as the corresponding non-test apex.

Bug: 383592644
Test: builds
Change-Id: I8c29e191629f97f7571263e9318be67513f2a853
parent 918c9f52
No related branches found
No related tags found
No related merge requests found
......@@ -41,10 +41,7 @@ prebuilt_bootclasspath_fragment {
java_sdk_library_import {
name: "framework-statsd",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
shared_library: false,
permitted_packages: [
......@@ -82,10 +79,7 @@ java_sdk_library_import {
java_import {
name: "service-statsd",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
min_sdk_version: "30",
......@@ -101,10 +95,7 @@ license {
cc_prebuilt_library_shared {
name: "libstatspull",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
stl: "none",
compile_multilib: "both",
......@@ -137,10 +128,7 @@ cc_prebuilt_library_shared {
cc_prebuilt_library_shared {
name: "libstatssocket",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
stl: "none",
compile_multilib: "both",
......
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