Merge "List baseline_filename on modules that are implititly using it" into... (d8ba9c19) · Commits · e / os / android_frameworks_base

Android.bp

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -163,6 +163,9 @@ java_library {
	"//external/robolectric:__subpackages__",		"//external/robolectric:__subpackages__",
	"//frameworks/layoutlib:__subpackages__",		"//frameworks/layoutlib:__subpackages__",
	],		],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	// AIDL files under these paths are mixture of public and private ones.		// AIDL files under these paths are mixture of public and private ones.
	@@ -257,6 +260,9 @@ java_library {
	],		],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	installable: false,		installable: false,
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in		// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in
	@@ -423,6 +429,9 @@ java_library {
	],		],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	installable: false,		installable: false,
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	// Separated so framework-minus-apex-defaults can be used without the libs dependency		// Separated so framework-minus-apex-defaults can be used without the libs dependency
	@@ -466,6 +475,9 @@ java_library {
	],		],
	compile_dex: false,		compile_dex: false,
	headers_only: true,		headers_only: true,
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	java_library {		java_library {
	@@ -493,6 +505,9 @@ java_library {
	"-Xep:AndroidFrameworkUid:ERROR",		"-Xep:AndroidFrameworkUid:ERROR",
	],		],
	},		},
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	java_library {		java_library {
	@@ -507,6 +522,7 @@ java_library {
	},		},
	lint: {		lint: {
	enabled: false,		enabled: false,
			baseline_filename: "lint-baseline.xml",
	},		},
	}		}

	@@ -531,6 +547,9 @@ java_library {
	],		],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	apex_available: ["//apex_available:platform"],		apex_available: ["//apex_available:platform"],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	java_library {		java_library {
	@@ -545,6 +564,9 @@ java_library {
	"calendar-provider-compat-config",		"calendar-provider-compat-config",
	"contacts-provider-platform-compat-config",		"contacts-provider-platform-compat-config",
	],		],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	platform_compat_config {		platform_compat_config {
	@@ -592,6 +614,9 @@ java_library {
	"rappor",		"rappor",
	],		],
	dxflags: ["--core-library"],		dxflags: ["--core-library"],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	// utility classes statically linked into framework-wifi and dynamically linked		// utility classes statically linked into framework-wifi and dynamically linked
	@@ -617,6 +642,9 @@ java_library {
	"//frameworks/base/services/net",		"//frameworks/base/services/net",
	"//packages/modules/Wifi/framework",		"//packages/modules/Wifi/framework",
	],		],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	filegroup {		filegroup {

packages/SettingsLib/AdaptiveIcon/Android.bp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,8 +15,11 @@ android_library {

	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"SettingsLibTile"		"SettingsLibTile",
	],		],

	min_sdk_version: "21",		min_sdk_version: "21",
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

packages/SettingsLib/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,9 @@ android_library {
	"src/*/.java",		"src/*/.java",
	"src/*/.kt",		"src/*/.kt",
	],		],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

	// NOTE: Keep this module in sync with ./common.mk		// NOTE: Keep this module in sync with ./common.mk

packages/SettingsLib/EmergencyNumber/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,4 +16,7 @@ android_library {
	],		],
	sdk_version: "system_current",		sdk_version: "system_current",
	min_sdk_version: "21",		min_sdk_version: "21",
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}

packages/SettingsLib/MainSwitchPreference/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,4 +28,7 @@ android_library {
	"com.android.extservices",		"com.android.extservices",
	"com.android.healthfitness",		"com.android.healthfitness",
	],		],
			lint: {
			baseline_filename: "lint-baseline.xml",
			},
	}		}