Merge "Rename and move stub defaults to modules/common" (373a2703) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+4 −14

Original line number	Diff line number	Diff line
		@@ -391,16 +391,6 @@ java_library_static {
		},
		}

		java_defaults {
		name: "android_defaults_stubs_current",
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",
		compile_dex: true,
		defaults_visibility: ["//visibility:private"],
		visibility: ["//visibility:public"],
		}

		java_defaults {
		name: "android_stubs_dists_default",
		dist: {
		@@ -420,7 +410,7 @@ java_library_static {
		"android-non-updatable.stubs",
		"private-stub-annotations-jar",
		],
		defaults: ["android_defaults_stubs_current"],
		defaults: ["android.jar_defaults"],
		}

		java_library_static {
		@@ -430,7 +420,7 @@ java_library_static {
		"private-stub-annotations-jar",
		],
		defaults: [
		"android_defaults_stubs_current",
		"android.jar_defaults",
		"android_stubs_dists_default",
		],
		dist: {
		@@ -458,7 +448,7 @@ java_library_static {
		"private-stub-annotations-jar",
		],
		defaults: [
		"android_defaults_stubs_current",
		"android.jar_defaults",
		"android_stubs_dists_default",
		],
		dist: {
		@@ -469,7 +459,7 @@ java_library_static {
		java_library_static {
		name: "android_module_lib_stubs_current",
		defaults: [
		"android_defaults_stubs_current",
		"android.jar_defaults",
		"android_stubs_dists_default",
		],
		static_libs: [