Fix issue with duplicate symbols in renderengine_test
The test binary statically links two renderengine targets both of
which included skia as a whole static lib which was causing symbol
collisions when attempting to roll in a new version of Skia.
Test: make
Bug: 179813345
Change-Id: I1208a003d85b4fd3c4d6df7765d0215ab13e584f
diff --git a/libs/renderengine/Android.bp b/libs/renderengine/Android.bp
index d69c7ae..00540b8 100644
--- a/libs/renderengine/Android.bp
+++ b/libs/renderengine/Android.bp
@@ -31,10 +31,6 @@
"libui",
"libutils",
],
- include_dirs: [
- "external/skia/src/gpu",
- ],
- whole_static_libs: ["libskia"],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
}
@@ -106,6 +102,10 @@
":librenderengine_threaded_sources",
":librenderengine_skia_sources",
],
+ include_dirs: [
+ "external/skia/src/gpu",
+ ],
+ whole_static_libs: ["libskia"],
lto: {
thin: true,
},