Merge "List baseline_filename on modules that are implititly using it" into main (aa5a0600) · Commits · e / os / android_packages_apps_Trebuchet

Android.bp

+70 −24

Original line number	Diff line number	Diff line
		@@ -23,42 +23,66 @@ min_launcher3_sdk_version = "26"
		// All sources are split so they can be reused in many other libraries/apps in other folders
		filegroup {
		name: "launcher-src",
		srcs: [ "src/*/.java", "src/*/.kt" ],
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-quickstep-src",
		srcs: [ "quickstep/src/*/.java", "quickstep/src/*/.kt" ],
		srcs: [
		"quickstep/src/*/.java",
		"quickstep/src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-go-src",
		srcs: [ "go/src/*/.java", "go/src/*/.kt" ],
		srcs: [
		"go/src/*/.java",
		"go/src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-go-quickstep-src",
		srcs: [ "go/quickstep/src/*/.java", "go/quickstep/src/*/.kt" ],
		srcs: [
		"go/quickstep/src/*/.java",
		"go/quickstep/src/*/.kt",
		],
		}

		filegroup {
		name: "launcher-src_shortcuts_overrides",
		srcs: [ "src_shortcuts_overrides/*/.java", "src_shortcuts_overrides/*/.kt" ],
		srcs: [
		"src_shortcuts_overrides/*/.java",
		"src_shortcuts_overrides/*/.kt",
		],
		}

		filegroup {
		name: "launcher-src_ui_overrides",
		srcs: [ "src_ui_overrides/*/.java", "src_ui_overrides/*/.kt" ],
		srcs: [
		"src_ui_overrides/*/.java",
		"src_ui_overrides/*/.kt",
		],
		}

		filegroup {
		name: "launcher-ext_tests",
		srcs: [ "ext_tests/*/.java", "ext_tests/*/.kt" ],
		srcs: [
		"ext_tests/*/.java",
		"ext_tests/*/.kt",
		],
		}

		filegroup {
		name: "launcher-quickstep-ext_tests",
		srcs: [ "quickstep/ext_tests/*/.java", "quickstep/ext_tests/*/.kt" ],
		srcs: [
		"quickstep/ext_tests/*/.java",
		"quickstep/ext_tests/*/.kt",
		],
		}

		// Proguard files for Launcher3
		@@ -88,6 +112,9 @@ android_library {
		resource_dirs: [],
		manifest: "tests/tapl/AndroidManifest.xml",
		platform_apis: true,
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		java_library_static {
		@@ -105,6 +132,9 @@ java_library_static {
		],
		},
		static_libs: ["libprotobuf-java-lite"],
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		java_library_static {
		@@ -121,8 +151,11 @@ java_library_static {
		},
		static_libs: [
		"libprotobuf-java-lite",
		"launcher_log_protos_lite"
		"launcher_log_protos_lite",
		],
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		java_library {
		@@ -134,6 +167,9 @@ java_library {

		sdk_version: "current",
		min_sdk_version: min_launcher3_sdk_version,
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		// Library with all the dependencies for building Launcher3
		@@ -154,7 +190,7 @@ android_library {
		"com.google.android.material_material",
		"iconloader_base",
		"view_capture",
		"animationlib"
		"animationlib",
		],
		manifest: "AndroidManifest-common.xml",
		sdk_version: "current",
		@@ -173,7 +209,7 @@ android_library {
		static_libs: [
		"Launcher3ResLib",
		"launcher-testing-shared",
		"animationlib"
		"animationlib",
		],
		sdk_version: "current",
		min_sdk_version: min_launcher3_sdk_version,
		@@ -249,9 +285,11 @@ android_library {
		],
		manifest: "quickstep/AndroidManifest.xml",
		min_sdk_version: "current",
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}


		// Library with all the dependencies for building Launcher Go
		android_library {
		name: "LauncherGoResLib",
		@@ -356,7 +394,10 @@ android_app {
		manifest: "go/AndroidManifest.xml",
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		}
		},
		lint: {
		baseline_filename: "lint-baseline.xml",
		},

		}

		@@ -392,7 +433,10 @@ android_app {
		manifest: "quickstep/AndroidManifest.xml",
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		}
		},
		lint: {
		baseline_filename: "lint-baseline.xml",
		},

		}

		@@ -442,7 +486,9 @@ android_app {
		manifest: "quickstep/AndroidManifest.xml",
		jacoco: {
		include_filter: ["com.android.launcher3.*"],
		}
		},
		lint: {
		baseline_filename: "lint-baseline.xml",
		},

		}