Merge "Add bp-based disting of android stubs" (6b54515b) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+46 −3

Original line number	Diff line number	Diff line
		@@ -299,6 +299,15 @@ java_defaults {
		compile_dex: true,
		}

		java_defaults {
		name: "android_stubs_dists_default",
		dist: {
		targets: ["sdk", "win_sdk"],
		tag: ".jar",
		dest: "android.jar",
		},
		}

		java_library_static {
		name: "android_stubs_current",
		srcs: [ ":api-stubs-docs" ],
		@@ -308,20 +317,54 @@ java_library_static {
		java_library_static {
		name: "android_system_stubs_current",
		srcs: [ ":system-api-stubs-docs" ],
		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 {
		name: "android_test_stubs_current",
		srcs: [ ":test-api-stubs-docs" ],
		defaults: ["android_defaults_stubs_current"],
		defaults: [
		"android_defaults_stubs_current",
		"android_stubs_dists_default",
		],
		dist: {
		dir: "apistubs/android/test",
		},
		dists: [
		{
		// Legacy dist path
		targets: ["sdk", "win_sdk"],
		tag: ".jar",
		dest: "android_test.jar",
		},
		],
		}

		java_library_static {
		name: "android_module_lib_stubs_current",
		srcs: [ ":module-lib-api-stubs-docs-non-updatable" ],
		defaults: ["android_defaults_stubs_current"],
		defaults: [
		"android_defaults_stubs_current",
		"android_stubs_dists_default",
		],
		libs: ["sdk_system_29_android"],
		dist: {
		dir: "apistubs/android/module-lib",
		},
		}

		java_library_static {

+4 −0

Original line number	Diff line number	Diff line
		@@ -140,10 +140,14 @@ droidstubs {

		java_library {
		name: "android_system_server_stubs_current",
		defaults: ["android_stubs_dists_default"],
		srcs: [":services-stubs.sources"],
		installable: false,
		static_libs: ["android_module_lib_stubs_current"],
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",
		dist: {
		dir: "apistubs/android/system-server",
		},
		}