Merge changes from topic "java_sdk_library_module_lib" am: 53655f77a6 (add87675) · Commits · e / os / android_frameworks_base

apex/sdkextensions/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ apex_defaults {

	sdk {		sdk {
	name: "sdkextensions-sdk",		name: "sdkextensions-sdk",
	java_header_libs: [ "framework-sdkextensions-stubs-systemapi" ],		java_sdk_libs: [ "framework-sdkextensions" ],
	}		}

	apex_key {		apex_key {

apex/sdkextensions/framework/Android.bp

+8 −76

Original line number	Original line	Diff line number	Diff line
	@@ -25,14 +25,18 @@ filegroup {
	visibility: [ "//frameworks/base" ] // For the "global" stubs.		visibility: [ "//frameworks/base" ] // For the "global" stubs.
	}		}

	java_library {		java_sdk_library {
	name: "framework-sdkextensions",		name: "framework-sdkextensions",
	srcs: [ ":framework-sdkextensions-sources" ],		srcs: [ ":framework-sdkextensions-sources" ],
	sdk_version: "system_current",		defaults: ["framework-module-defaults"],
	libs: [ "framework-annotations-lib" ],
			// TODO(b/155480189) - Remove naming_scheme once references have been resolved.
			// Temporary java_sdk_library component naming scheme to use to ease the transition from separate
			// modules to java_sdk_library.
			naming_scheme: "framework-modules",

	permitted_packages: [ "android.os.ext" ],		permitted_packages: [ "android.os.ext" ],
	installable: true,		installable: true,
	plugins: ["java_api_finder"],
	visibility: [		visibility: [
	"//frameworks/base/apex/sdkextensions",		"//frameworks/base/apex/sdkextensions",
	"//frameworks/base/apex/sdkextensions/testing",		"//frameworks/base/apex/sdkextensions/testing",
	@@ -43,75 +47,3 @@ java_library {
	"test_com.android.sdkext",		"test_com.android.sdkext",
	],		],
	}		}

	stubs_defaults {
	name: "framework-sdkextensions-stubs-defaults",
	srcs: [ ":framework-sdkextensions-sources" ],
	libs: [ "framework-annotations-lib" ],
	dist: { dest: "framework-sdkextensions.txt" },
	}

	droidstubs {
	name: "framework-sdkextensions-stubs-srcs-publicapi",
	defaults: [
	"framework-module-stubs-defaults-publicapi",
	"framework-sdkextensions-stubs-defaults",
	],
	}

	droidstubs {
	name: "framework-sdkextensions-stubs-srcs-systemapi",
	defaults: [
	"framework-module-stubs-defaults-systemapi",
	"framework-sdkextensions-stubs-defaults",
	],
	}

	droidstubs {
	name: "framework-sdkextensions-api-module_libs_api",
	defaults: [
	"framework-module-api-defaults-module_libs_api",
	"framework-sdkextensions-stubs-defaults",
	],
	}

	droidstubs {
	name: "framework-sdkextensions-stubs-srcs-module_libs_api",
	defaults: [
	"framework-module-stubs-defaults-module_libs_api",
	"framework-sdkextensions-stubs-defaults",
	],
	}

	java_library {
	name: "framework-sdkextensions-stubs-publicapi",
	srcs: [":framework-sdkextensions-stubs-srcs-publicapi"],
	defaults: ["framework-module-stubs-lib-defaults-publicapi"],
	visibility: [
	"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	],
	dist: { dest: "framework-sdkextensions.jar" },
	}

	java_library {
	name: "framework-sdkextensions-stubs-systemapi",
	srcs: [":framework-sdkextensions-stubs-srcs-systemapi"],
	defaults: ["framework-module-stubs-lib-defaults-systemapi"],
	visibility: [
	"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	],
	dist: { dest: "framework-sdkextensions.jar" },
	}

	java_library {
	name: "framework-sdkextensions-stubs-module_libs_api",
	srcs: [":framework-sdkextensions-stubs-srcs-module_libs_api"],
	defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
	visibility: [
	"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	],
	dist: { dest: "framework-sdkextensions.jar" },
	}