From 013dc72801b78eb2fa258ce060865e7b8a410c60 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 24 Mar 2020 19:50:06 +0000 Subject: [PATCH] Make framework-wifi stubs use the new defaults Makes it convenient to change all stubs from a central place. Bug: 149293194 Test: m framework-wifi-stubs{public,system,module_libs_}api Change-Id: Ie857558b507c90dd46a7777c82f14d7d45422222 --- wifi/Android.bp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wifi/Android.bp b/wifi/Android.bp index 9d9a495d68efe..d0f1a26f7dbf9 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -170,24 +170,23 @@ droidstubs { java_library { name: "framework-wifi-stubs-publicapi", srcs: [":framework-wifi-stubs-srcs-publicapi"], + defaults: ["framework-module-stubs-lib-defaults-publicapi"], + // TODO(b/151134996): remove this sdk_version: "current", - installable: false, } java_library { name: "framework-wifi-stubs-systemapi", srcs: [":framework-wifi-stubs-srcs-systemapi"], - sdk_version: "system_current", libs: ["framework-annotations-lib"], - installable: false, + defaults: ["framework-module-stubs-lib-defaults-systemapi"], } java_library { name: "framework-wifi-stubs-module_libs_api", srcs: [":framework-wifi-stubs-srcs-module_libs_api"], - sdk_version: "module_current", libs: ["framework-annotations-lib"], - installable: false, + defaults: ["framework-module-stubs-lib-defaults-module_libs_api"], } // defaults for tests that need to build against framework-wifi's @hide APIs