Merge "Add stubs and an sdk definition for sdkext" am: 4c1f4c2bc6 am: 2bb61d97c5 (b9a1698c) · Commits · e / os / android_frameworks_base

Android.bp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -459,7 +459,8 @@ java_library {
	installable: false, // this lib is a build-only library		installable: false, // this lib is a build-only library
	static_libs: [		static_libs: [
	"framework-minus-apex",		"framework-minus-apex",
	// TODO(jiyong): add stubs for APEXes here		"framework-sdkext-stubs-systemapi",
			// TODO(jiyong): add more stubs for APEXes here
	],		],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	}		}

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,11 @@ apex {
	certificate: ":com.android.sdkext.certificate",		certificate: ":com.android.sdkext.certificate",
	}		}

			sdk {
			name: "sdkext-sdk",
			java_libs: [ "framework-sdkext-stubs-systemapi" ],
			}

	apex_key {		apex_key {
	name: "com.android.sdkext.key",		name: "com.android.sdkext.key",
	public_key: "com.android.sdkext.avbpubkey",		public_key: "com.android.sdkext.avbpubkey",

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,3 +28,34 @@ java_library {
	permitted_packages: [ "android.os.ext" ],		permitted_packages: [ "android.os.ext" ],
	installable: true,		installable: true,
	}		}

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

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

			stubs_defaults {
			name: "framework-sdkext-stubs-defaults",
			srcs: [
			":framework-sdkext-sources",
			":framework-annotations",
			],
			sdk_version: "system_current",
			}

			java_library {
			name: "framework-sdkext-stubs-systemapi",
			srcs: [":framework-sdkext-droidstubs-systemapi"],
			sdk_version: "system_current",
			}