Merge "Use sdk_version: none for platform stubs" am: ad2433ffcd am: b85c57cd47 (1b0df10b) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+6 −6

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ droidstubs {
		/////////////////////////////////////////////////////////////////////

		java_defaults {
		name: "framework-stubs-default",
		name: "android_defaults_stubs_current",
		libs: [ "stub-annotations" ],
		static_libs: [
		"private-stub-annotations-jar",
		@@ -268,12 +268,12 @@ java_defaults {
		// License notices from art module
		"art-notices-for-framework-stubs-jar",
		],
		sdk_version: "core_current",
		errorprone: {
		javacflags: [
		"-XepDisableAllChecks",
		],
		},
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",
		compile_dex: true,
		@@ -282,25 +282,25 @@ java_defaults {
		java_library_static {
		name: "android_stubs_current",
		srcs: [ ":api-stubs-docs" ],
		defaults: ["framework-stubs-default"],
		defaults: ["android_defaults_stubs_current"],
		}

		java_library_static {
		name: "android_system_stubs_current",
		srcs: [ ":system-api-stubs-docs" ],
		defaults: ["framework-stubs-default"],
		defaults: ["android_defaults_stubs_current"],
		}

		java_library_static {
		name: "android_test_stubs_current",
		srcs: [ ":test-api-stubs-docs" ],
		defaults: ["framework-stubs-default"],
		defaults: ["android_defaults_stubs_current"],
		}

		java_library_static {
		name: "android_module_lib_stubs_current",
		srcs: [ ":module-lib-api-stubs-docs" ],
		defaults: ["framework-stubs-default"],
		defaults: ["android_defaults_stubs_current"],
		libs: ["android_system_stubs_current"],
		}