Merge "Make framework-wifi stubs use the new defaults" into rvc-dev am: 3544feedb7 am: dbf582efb9 am: 5063a4edbf

Change-Id: Iab783fee4c916c424a4414762a1e1b7b9edb5433
This commit is contained in:
Anton Hansson
2020-03-25 13:53:00 +00:00
committed by Automerger Merge Worker

View File

@@ -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