Merge "Use select syntax on from-text vs from-source static lib selection" into main (6caaf2f3) · Commits · e / os / android_frameworks_base

api/StubLibraries.bp

+40 −65

Original line number	Original line	Diff line number	Diff line
	@@ -364,19 +364,14 @@ java_defaults {
	java_library {		java_library {
	name: "android-non-updatable.stubs",		name: "android-non-updatable.stubs",
	defaults: ["android-non-updatable_defaults"],		defaults: ["android-non-updatable_defaults"],
	static_libs: [		static_libs: select(product_variable("build_from_text_stub"), {
	"android-non-updatable.stubs.from-source",		true: [
	],
	product_variables: {
	build_from_text_stub: {
	static_libs: [
	"android-non-updatable.stubs.from-text",		"android-non-updatable.stubs.from-text",
	],		],
	exclude_static_libs: [		default: [
	"android-non-updatable.stubs.from-source",		"android-non-updatable.stubs.from-source",
	],		],
	},		}),
	},
	}		}

	java_library {		java_library {
	@@ -390,19 +385,14 @@ java_library {
	java_library {		java_library {
	name: "android-non-updatable.stubs.system",		name: "android-non-updatable.stubs.system",
	defaults: ["android-non-updatable_defaults"],		defaults: ["android-non-updatable_defaults"],
	static_libs: [		static_libs: select(product_variable("build_from_text_stub"), {
	"android-non-updatable.stubs.system.from-source",		true: [
	],
	product_variables: {
	build_from_text_stub: {
	static_libs: [
	"android-non-updatable.stubs.system.from-text",		"android-non-updatable.stubs.system.from-text",
	],		],
	exclude_static_libs: [		default: [
	"android-non-updatable.stubs.system.from-source",		"android-non-updatable.stubs.system.from-source",
	],		],
	},		}),
	},
	}		}

	java_library {		java_library {
	@@ -416,19 +406,14 @@ java_library {
	java_library {		java_library {
	name: "android-non-updatable.stubs.module_lib",		name: "android-non-updatable.stubs.module_lib",
	defaults: ["android-non-updatable_defaults"],		defaults: ["android-non-updatable_defaults"],
	static_libs: [		static_libs: select(product_variable("build_from_text_stub"), {
	"android-non-updatable.stubs.module_lib.from-source",		true: [
	],
	product_variables: {
	build_from_text_stub: {
	static_libs: [
	"android-non-updatable.stubs.module_lib.from-text",		"android-non-updatable.stubs.module_lib.from-text",
	],		],
	exclude_static_libs: [		default: [
	"android-non-updatable.stubs.module_lib.from-source",		"android-non-updatable.stubs.module_lib.from-source",
	],		],
	},		}),
	},
	}		}

	java_library {		java_library {
	@@ -442,19 +427,14 @@ java_library {
	java_library {		java_library {
	name: "android-non-updatable.stubs.test",		name: "android-non-updatable.stubs.test",
	defaults: ["android-non-updatable_defaults"],		defaults: ["android-non-updatable_defaults"],
	static_libs: [		static_libs: select(product_variable("build_from_text_stub"), {
	"android-non-updatable.stubs.test.from-source",		true: [
	],
	product_variables: {
	build_from_text_stub: {
	static_libs: [
	"android-non-updatable.stubs.test.from-text",		"android-non-updatable.stubs.test.from-text",
	],		],
	exclude_static_libs: [		default: [
	"android-non-updatable.stubs.test.from-source",		"android-non-updatable.stubs.test.from-source",
	],		],
	},		}),
	},
	}		}

	java_library {		java_library {
	@@ -468,19 +448,14 @@ java_library {
	java_library {		java_library {
	name: "android-non-updatable.stubs.system_server",		name: "android-non-updatable.stubs.system_server",
	defaults: ["android-non-updatable_defaults"],		defaults: ["android-non-updatable_defaults"],
	static_libs: [		static_libs: select(product_variable("build_from_text_stub"), {
	"android-non-updatable.stubs.system_server.from-source",		true: [
	],
	product_variables: {
	build_from_text_stub: {
	static_libs: [
	"android-non-updatable.stubs.system_server.from-text",		"android-non-updatable.stubs.system_server.from-text",
	],		],
	exclude_static_libs: [		default: [
	"android-non-updatable.stubs.system_server.from-source",		"android-non-updatable.stubs.system_server.from-source",
	],		],
	},		}),
	},
	}		}

	java_library {		java_library {