From e58e9d610b450ca1cd067c198fe4d958f88f420f Mon Sep 17 00:00:00 2001 From: Salud Lemus Date: Wed, 22 Jul 2020 19:53:44 +0000 Subject: [PATCH] Revert^2 "Make libstatspull host supported" 17f9775922a3a9295ad39ce7de83fb2d36ab5dac Change-Id: If4aa1e68b96617bbf896089fd19ba066eb68e4ed --- libstats/pull/Android.bp | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libstats/pull/Android.bp b/libstats/pull/Android.bp index a8b4a4faf..5dfb840db 100644 --- a/libstats/pull/Android.bp +++ b/libstats/pull/Android.bp @@ -30,18 +30,39 @@ cc_defaults { shared_libs: [ "libbinder_ndk", "liblog", - "libstatssocket", ], static_libs: [ "libutils", "statsd-aidl-ndk_platform", ], + target: { + android: { + shared_libs: ["libstatssocket"], + }, + host: { + static_libs: ["libstatssocket"], + }, + }, } -cc_library_shared { +cc_library { name: "libstatspull", defaults: [ - "libstatspull_defaults" + "libstatspull_defaults", + "libbinder_ndk_host_user", ], + host_supported: true, + target: { + android: { + static: { + enabled: false, + }, + }, + host: { + shared: { + enabled: false, + }, + }, + }, // enumerate stable entry points for APEX use stubs: { symbol_file: "libstatspull.map.txt",