Merge "Replace source based system server stubs" (e93cf9e5) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -471,6 +471,22 @@ java_library_static {
		},
		}

		java_library {
		name: "android_system_server_stubs_current",
		defaults: ["android_stubs_dists_default"],
		srcs: [":services-non-updatable-stubs"],
		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",
		},
		}

		/////////////////////////////////////////////////////////////////////
		// hwbinder.stubs provides APIs required for building HIDL Java
		// libraries.

api/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ genrule {
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "merge-android.txt",
		dest: "android.txt",
		},
		],
		}
		@@ -364,7 +364,7 @@ genrule {
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "merge-removed.txt",
		dest: "removed.txt",
		},
		],
		}

services/Android.bp

+2 −58

Original line number	Diff line number	Diff line
		@@ -146,68 +146,12 @@ stubs_defaults {
		" --hide-package com.google.android.startop.iorap" +
		" --hide DeprecationMismatch" +
		" --hide HiddenTypedefConstant",
		visibility: ["//visibility:private"],
		visibility: ["//frameworks/base:__subpackages__"],
		filter_packages: ["com.android."],
		}

		droidstubs {
		name: "services-stubs.sources",
		srcs: [":services-all-sources"],
		defaults: ["services-stubs-default"],
		check_api: {
		current: {
		api_file: "api/current.txt",
		removed_api_file: "api/removed.txt",
		},
		last_released: {
		api_file: ":android.api.system-server.latest",
		removed_api_file: ":removed.api.system-server.latest",
		baseline_file: ":android-incompatibilities.api.system-server.latest",
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.system-server.latest",
		baseline_file: "api/lint-baseline.txt",
		},
		},
		dists: [
		{
		targets: [
		"sdk",
		"win_sdk",
		],
		dir: "apistubs/android/system-server/api",
		dest: "android.txt",
		tag: ".api.txt",
		},
		{
		targets: [
		"sdk",
		"win_sdk",
		],
		dir: "apistubs/android/system-server/api",
		dest: "removed.txt",
		tag: ".removed-api.txt",
		},
		],
		}

		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",
		},
		}

		droidstubs {
		name: "services-non-updatable-stubs.sources",
		name: "services-non-updatable-stubs",
		srcs: [":services-non-updatable-sources"],
		defaults: ["services-stubs-default"],
		check_api: {