Merge "Make framework-wifi stubs use the new defaults" into rvc-dev

This commit is contained in:
Anton Hansson
2020-03-25 13:21:40 +00:00
committed by Android (Google) Code Review

View File

@@ -170,24 +170,23 @@ droidstubs {
java_library { java_library {
name: "framework-wifi-stubs-publicapi", name: "framework-wifi-stubs-publicapi",
srcs: [":framework-wifi-stubs-srcs-publicapi"], srcs: [":framework-wifi-stubs-srcs-publicapi"],
defaults: ["framework-module-stubs-lib-defaults-publicapi"],
// TODO(b/151134996): remove this
sdk_version: "current", sdk_version: "current",
installable: false,
} }
java_library { java_library {
name: "framework-wifi-stubs-systemapi", name: "framework-wifi-stubs-systemapi",
srcs: [":framework-wifi-stubs-srcs-systemapi"], srcs: [":framework-wifi-stubs-srcs-systemapi"],
sdk_version: "system_current",
libs: ["framework-annotations-lib"], libs: ["framework-annotations-lib"],
installable: false, defaults: ["framework-module-stubs-lib-defaults-systemapi"],
} }
java_library { java_library {
name: "framework-wifi-stubs-module_libs_api", name: "framework-wifi-stubs-module_libs_api",
srcs: [":framework-wifi-stubs-srcs-module_libs_api"], srcs: [":framework-wifi-stubs-srcs-module_libs_api"],
sdk_version: "module_current",
libs: ["framework-annotations-lib"], 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 // defaults for tests that need to build against framework-wifi's @hide APIs