Merge "Rework how RenderEngine and SurfaceFlinger include Skia" (e93a9078) · Commits · e / os / android_frameworks_native

libs/renderengine/Android.bp

+15 −2

Original line number	Diff line number	Diff line
		@@ -111,9 +111,23 @@ filegroup {
		],
		}

		// Used to consolidate and simplify pulling Skia & Skia deps into targets that depend on
		// librenderengine. This allows shared deps to be deduplicated (e.g. Perfetto), which doesn't seem
		// possible if libskia_renderengine is just pulled into librenderengine via whole_static_libs.
		cc_defaults {
		name: "librenderengine_deps",
		defaults: ["skia_renderengine_deps"],
		static_libs: ["libskia_renderengine"],
		}

		// Note: if compilation fails when adding librenderengine as a dependency, try adding
		// librenderengine_deps to the defaults field of your dependent target.
		cc_library_static {
		name: "librenderengine",
		defaults: ["librenderengine_defaults"],
		defaults: [
		"librenderengine_defaults",
		"librenderengine_deps",
		],
		double_loadable: true,
		cflags: [
		"-fvisibility=hidden",
		@@ -132,7 +146,6 @@ cc_library_static {
		include_dirs: [
		"external/skia/src/gpu",
		],
		whole_static_libs: ["libskia_renderengine"],
		lto: {
		thin: true,
		},

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ cc_benchmark {
		name: "librenderengine_bench",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"skia_deps",
		"librenderengine_deps",
		"surfaceflinger_defaults",
		],
		srcs: [

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ cc_test {
		name: "librenderengine_test",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"skia_deps",
		"librenderengine_deps",
		"surfaceflinger_defaults",
		],
		test_suites: ["device-tests"],

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ cc_defaults {
		name: "libsurfaceflinger_defaults",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"librenderengine_deps",
		"surfaceflinger_defaults",
		"skia_renderengine_deps",
		],
		cflags: [
		"-DLOG_TAG=\"SurfaceFlinger\"",

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ cc_defaults {
		name: "libcompositionengine_defaults",
		defaults: [
		"android.hardware.graphics.composer3-ndk_shared",
		"librenderengine_deps",
		"surfaceflinger_defaults",
		],
		cflags: [