Merge "framework-wifi & OsuLogin: set min & target SDK version to 30" into rvc-dev (e640bbf9) · Commits · e / os / android_frameworks_base

packages/OsuLogin/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		android_app {
		name: "OsuLogin",
		defaults: ["wifi-module-sdk-version-defaults"],
		static_libs: ["androidx.legacy_legacy-support-v4"],
		resource_dirs: ["res"],
		srcs: ["src/*/.java"],

+11 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,12 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		java_defaults {
		name: "wifi-module-sdk-version-defaults",
		min_sdk_version: "30",
		target_sdk_version: "30",
		}

		filegroup {
		name: "framework-wifi-updatable-exported-aidl-sources",
		srcs: ["aidl-export/*/.aidl"],
		@@ -73,6 +79,7 @@ test_access_hidden_api_whitelist = [
		// classes before they are renamed.
		java_library {
		name: "framework-wifi-pre-jarjar",
		defaults: ["wifi-module-sdk-version-defaults"],
		sdk_version: "module_current",
		static_libs: [
		"framework-wifi-util-lib",
		@@ -98,7 +105,10 @@ java_library {
		// post-jarjar version of framework-wifi
		java_sdk_library {
		name: "framework-wifi",
		defaults: ["framework-module-defaults"],
		defaults: [
		"framework-module-defaults",
		"wifi-module-sdk-version-defaults",
		],
		static_libs: [
		"framework-wifi-util-lib",
		"android.hardware.wifi-V1.0-java-constants",