Merge "Fix disting of android_system.jar" (0206a453) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+16 −16

Original line number	Diff line number	Diff line
		@@ -247,21 +247,7 @@ java_library_static {
		"framework-wifi.stubs",
		"private-stub-annotations-jar",
		],
		defaults: [
		"android_defaults_stubs_current",
		"android_stubs_dists_default",
		],
		dist: {
		dir: "apistubs/android/system",
		},
		dists: [
		{
		// Legacy dist path
		targets: ["sdk", "win_sdk"],
		tag: ".jar",
		dest: "android_system.jar",
		},
		],
		defaults: ["android_defaults_stubs_current"],
		}

		java_library_static {
		@@ -278,7 +264,21 @@ java_library_static {
		"framework-wifi.stubs.system",
		"private-stub-annotations-jar",
		],
		defaults: ["android_defaults_stubs_current"],
		defaults: [
		"android_defaults_stubs_current",
		"android_stubs_dists_default",
		],
		dist: {
		dir: "apistubs/android/system",
		},
		dists: [
		{
		// Legacy dist path
		targets: ["sdk", "win_sdk"],
		tag: ".jar",
		dest: "android_system.jar",
		},
		],
		}

		java_library_static {