diff options
Diffstat (limited to 'services/surfaceflinger/CompositionEngine/Android.bp')
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/Android.bp | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp index d738ccdb90..b3b9fe5981 100644 --- a/services/surfaceflinger/CompositionEngine/Android.bp +++ b/services/surfaceflinger/CompositionEngine/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_native_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_native_license"], -} - cc_defaults { name: "libcompositionengine_defaults", defaults: ["surfaceflinger_defaults"], @@ -15,6 +6,7 @@ cc_defaults { "-DATRACE_TAG=ATRACE_TAG_GRAPHICS", ], shared_libs: [ + "android.frameworks.vr.composer@2.0", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.composer@2.1", "android.hardware.graphics.composer@2.2", @@ -29,7 +21,6 @@ cc_defaults { "liblog", "libnativewindow", "libprotobuf-cpp-lite", - "libSurfaceFlingerProp", "libtimestats", "libui", "libutils", @@ -52,12 +43,6 @@ cc_library { name: "libcompositionengine", defaults: ["libcompositionengine_defaults"], srcs: [ - "src/planner/CachedSet.cpp", - "src/planner/Flattener.cpp", - "src/planner/LayerState.cpp", - "src/planner/Planner.cpp", - "src/planner/Predictor.cpp", - "src/planner/TexturePool.cpp", "src/ClientCompositionRequestCache.cpp", "src/CompositionEngine.cpp", "src/Display.cpp", @@ -104,11 +89,6 @@ cc_test { test_suites: ["device-tests"], defaults: ["libcompositionengine_defaults"], srcs: [ - "tests/planner/CachedSetTest.cpp", - "tests/planner/FlattenerTest.cpp", - "tests/planner/LayerStateTest.cpp", - "tests/planner/PredictorTest.cpp", - "tests/planner/TexturePoolTest.cpp", "tests/CompositionEngineTest.cpp", "tests/DisplayColorProfileTest.cpp", "tests/DisplayTest.cpp", @@ -116,9 +96,8 @@ cc_test { "tests/MockHWC2.cpp", "tests/MockHWComposer.cpp", "tests/MockPowerAdvisor.cpp", - "tests/OutputLayerTest.cpp", "tests/OutputTest.cpp", - "tests/ProjectionSpaceTest.cpp", + "tests/OutputLayerTest.cpp", "tests/RenderSurfaceTest.cpp", ], static_libs: [ @@ -142,6 +121,13 @@ cc_test { // // You can either "make dist tests" before flashing, or set this // option to false temporarily. - address: true, + + + // FIXME: ASAN build is broken for a while, but was not discovered + // since new PM silently suppressed ASAN. Temporarily turn off ASAN + // to unblock the compiler upgrade process. + // address: true, + // http://b/139747256 + address: false, }, } |