Merge "Fix profile guided compilation for secondaries and add more tests"
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index cce0579..40566e0 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1621,7 +1621,7 @@
" -p: capture screenshot to filename.png (requires -o)\n"
" -z: generate zipped file (requires -o)\n"
" -s: write output to control socket (for init)\n"
- " -S: write file location to control socket (for init; requires -o and -z)"
+ " -S: write file location to control socket (for init; requires -o and -z)\n"
" -q: disable vibrate\n"
" -B: send broadcast when finished (requires -o)\n"
" -P: send broadcast when started and update system properties on "
@@ -2213,9 +2213,11 @@
}
/* vibrate a few but shortly times to let user know it's finished */
- for (int i = 0; i < 3; i++) {
- Vibrate(75);
- usleep((75 + 50) * 1000);
+ if (do_vibrate) {
+ for (int i = 0; i < 3; i++) {
+ Vibrate(75);
+ usleep((75 + 50) * 1000);
+ }
}
/* tell activity manager we're done */
diff --git a/data/etc/android.hardware.vulkan.version-1_1.xml b/data/etc/android.hardware.vulkan.version-1_1.xml
new file mode 100644
index 0000000..9704e0f
--- /dev/null
+++ b/data/etc/android.hardware.vulkan.version-1_1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the standard feature indicating that the device has a Vulkan
+ driver that supports API version 1.1 (0x00401000) -->
+<permissions>
+ <feature name="android.hardware.vulkan.version" version="4198400" />
+</permissions>
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 939a209..c40cad3 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -615,7 +615,7 @@
windowType, ownerUid, &handle, &gbp);
ALOGE_IF(err, "SurfaceComposerClient::createSurface error %s", strerror(-err));
if (err == NO_ERROR) {
- sur = new SurfaceControl(this, handle, gbp);
+ sur = new SurfaceControl(this, handle, gbp, true /* owned */);
}
}
return sur;
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index f5fb8ac..5eafbb3 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -48,8 +48,9 @@
SurfaceControl::SurfaceControl(
const sp<SurfaceComposerClient>& client,
const sp<IBinder>& handle,
- const sp<IGraphicBufferProducer>& gbp)
- : mClient(client), mHandle(handle), mGraphicBufferProducer(gbp)
+ const sp<IGraphicBufferProducer>& gbp,
+ bool owned)
+ : mClient(client), mHandle(handle), mGraphicBufferProducer(gbp), mOwned(owned)
{
}
@@ -60,7 +61,9 @@
void SurfaceControl::destroy()
{
- if (isValid()) {
+ // Avoid destroying the server-side surface if we are not the owner of it, meaning that we
+ // retrieved it from another process.
+ if (isValid() && mOwned) {
mClient->destroySurface(mHandle);
}
// clear all references and trigger an IPC now, to make sure things
@@ -184,9 +187,11 @@
}
sp<IBinder> gbp;
parcel->readNullableStrongBinder(&gbp);
+
+ // We aren't the original owner of the surface.
return new SurfaceControl(new SurfaceComposerClient(
interface_cast<ISurfaceComposerClient>(client)),
- handle.get(), interface_cast<IGraphicBufferProducer>(gbp));
+ handle.get(), interface_cast<IGraphicBufferProducer>(gbp), false /* owned */);
}
// ----------------------------------------------------------------------------
diff --git a/libs/gui/include/gui/SurfaceControl.h b/libs/gui/include/gui/SurfaceControl.h
index 1416d87..bd987dd 100644
--- a/libs/gui/include/gui/SurfaceControl.h
+++ b/libs/gui/include/gui/SurfaceControl.h
@@ -87,7 +87,8 @@
SurfaceControl(
const sp<SurfaceComposerClient>& client,
const sp<IBinder>& handle,
- const sp<IGraphicBufferProducer>& gbp);
+ const sp<IGraphicBufferProducer>& gbp,
+ bool owned);
~SurfaceControl();
@@ -100,6 +101,7 @@
sp<IGraphicBufferProducer> mGraphicBufferProducer;
mutable Mutex mLock;
mutable sp<Surface> mSurfaceData;
+ bool mOwned;
};
}; // namespace android
diff --git a/libs/ui/Gralloc2.cpp b/libs/ui/Gralloc2.cpp
index 153d35a..b92cbf3 100644
--- a/libs/ui/Gralloc2.cpp
+++ b/libs/ui/Gralloc2.cpp
@@ -42,8 +42,8 @@
for (const auto bit : hardware::hidl_enum_iterator<BufferUsage>()) {
bits = bits | bit;
}
- // TODO(b/72323293): Remove this mask for EXTERNAL_DISP.
- bits = bits | (1 << 13);
+ // TODO(b/72323293, b/72703005): Remove these additional bits
+ bits = bits | (1 << 10) | (1 << 13);
return bits;
}();
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 1c5b2d6..9b6f0c5 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -26,7 +26,6 @@
includeFiles = [ "include" ]
staticLibraries = [
- "libsurfaceflingerincludes",
"libbufferhub",
"libbufferhubqueue",
"libdisplay",
@@ -63,8 +62,9 @@
]
headerLibraries = [
- "libdvr_headers",
"android.hardware.graphics.composer@2.1-command-buffer",
+ "libdvr_headers",
+ "libsurfaceflinger_headers",
]
cc_library_static {
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index bd7f0ea..9f3189a 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -1,8 +1,209 @@
-cc_library_static {
- name: "libsurfaceflingerincludes",
+cc_defaults {
+ name: "surfaceflinger_defaults",
+ cflags: [
+ "-DLOG_TAG=\"SurfaceFlinger\"",
+ "-Wall",
+ "-Werror",
+ "-Wunused",
+ "-Wunreachable-code",
+ ],
+ cppflags: ["-std=c++1z"],
+}
+
+cc_defaults {
+ name: "libsurfaceflinger_defaults",
+ defaults: ["surfaceflinger_defaults"],
+ cflags: [
+ "-DGL_GLEXT_PROTOTYPES",
+ "-DEGL_EGLEXT_PROTOTYPES",
+ ],
+ shared_libs: [
+ "android.frameworks.vr.composer@1.0",
+ "android.hardware.configstore-utils",
+ "android.hardware.configstore@1.0",
+ "android.hardware.graphics.allocator@2.0",
+ "android.hardware.graphics.composer@2.1",
+ "android.hardware.power@1.0",
+ "libbase",
+ "libbinder",
+ "libcutils",
+ "libdl",
+ "libEGL",
+ "libfmq",
+ "libGLESv1_CM",
+ "libGLESv2",
+ "libgui",
+ "libhardware",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblayers_proto",
+ "liblog",
+ "libprotobuf-cpp-lite",
+ "libsync",
+ "libui",
+ "libutils",
+ "libvulkan",
+ ],
+ static_libs: [
+ "libserviceutils",
+ "libtrace_proto",
+ "libvkjson",
+ "libvr_manager",
+ "libvrflinger",
+ ],
+ header_libs: [
+ "android.hardware.graphics.composer@2.1-command-buffer",
+ ],
+ export_static_lib_headers: [
+ "libserviceutils",
+ ],
+ export_shared_lib_headers: [
+ "android.hardware.graphics.allocator@2.0",
+ "android.hardware.graphics.composer@2.1",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ ],
+}
+
+cc_library_headers {
+ name: "libsurfaceflinger_headers",
export_include_dirs: ["."],
static_libs = ["libserviceutils"],
export_static_lib_headers = ["libserviceutils"],
}
-subdirs = ["tests/fakehwc", "layerproto"]
\ No newline at end of file
+filegroup {
+ name: "libsurfaceflinger_sources",
+ srcs: [
+ "BufferLayer.cpp",
+ "BufferLayerConsumer.cpp",
+ "Client.cpp",
+ "ColorLayer.cpp",
+ "DisplayDevice.cpp",
+ "DisplayHardware/ComposerHal.cpp",
+ "DisplayHardware/FramebufferSurface.cpp",
+ "DisplayHardware/HWC2.cpp",
+ "DisplayHardware/HWComposer.cpp",
+ "DisplayHardware/HWComposerBufferCache.cpp",
+ "DisplayHardware/VirtualDisplaySurface.cpp",
+ "DispSync.cpp",
+ "Effects/Daltonizer.cpp",
+ "EventControlThread.cpp",
+ "EventLog/EventLog.cpp",
+ "EventThread.cpp",
+ "FrameTracker.cpp",
+ "GpuService.cpp",
+ "Layer.cpp",
+ "LayerProtoHelper.cpp",
+ "LayerRejecter.cpp",
+ "LayerVector.cpp",
+ "MessageQueue.cpp",
+ "MonitoredProducer.cpp",
+ "RenderArea.cpp",
+ "RenderEngine/Description.cpp",
+ "RenderEngine/GLES20RenderEngine.cpp",
+ "RenderEngine/GLExtensions.cpp",
+ "RenderEngine/Image.cpp",
+ "RenderEngine/Mesh.cpp",
+ "RenderEngine/Program.cpp",
+ "RenderEngine/ProgramCache.cpp",
+ "RenderEngine/RenderEngine.cpp",
+ "RenderEngine/Surface.cpp",
+ "RenderEngine/Texture.cpp",
+ "StartPropertySetThread.cpp",
+ "SurfaceFlinger.cpp",
+ "SurfaceInterceptor.cpp",
+ "SurfaceTracing.cpp",
+ "Transform.cpp",
+ ],
+}
+
+cc_library_shared {
+ name: "libsurfaceflinger",
+ defaults: ["libsurfaceflinger_defaults"],
+ cflags: [
+ "-fvisibility=hidden",
+ "-Werror=format",
+ ],
+ srcs: [
+ ":libsurfaceflinger_sources",
+ ],
+ logtags: ["EventLog/EventLogTags.logtags"],
+ include_dirs: [
+ "external/vulkan-validation-layers/libs/vkjson",
+ "frameworks/native/vulkan/include",
+ ],
+ cppflags: [
+ "-fwhole-program-vtables", // requires ThinLTO
+ ],
+ lto: {
+ thin: true,
+ },
+}
+
+cc_binary {
+ name: "surfaceflinger",
+ defaults: ["surfaceflinger_defaults"],
+ init_rc: ["surfaceflinger.rc"],
+ srcs: ["main_surfaceflinger.cpp"],
+ whole_static_libs: [
+ "libsigchain",
+ ],
+ shared_libs: [
+ "android.frameworks.displayservice@1.0",
+ "android.hardware.configstore-utils",
+ "android.hardware.configstore@1.0",
+ "android.hardware.graphics.allocator@2.0",
+ "libbinder",
+ "libcutils",
+ "libdisplayservicehidl",
+ "libhidlbase",
+ "libhidltransport",
+ "liblayers_proto",
+ "liblog",
+ "libsurfaceflinger",
+ "libutils",
+ ],
+ static_libs: [
+ "libserviceutils",
+ "libtrace_proto",
+ ],
+ ldflags: ["-Wl,--export-dynamic"],
+
+ // TODO(b/71715793): These version-scripts are required due to the use of
+ // whole_static_libs to pull in libsigchain. To work, the files had to be
+ // locally duplicated from their original location
+ // $ANDROID_ROOT/art/sigchainlib/
+ multilib: {
+ lib32: {
+ version_script: "version-script32.txt",
+ },
+ lib64: {
+ version_script: "version-script64.txt",
+ },
+ },
+}
+
+cc_library_shared {
+ name: "libsurfaceflinger_ddmconnection",
+ defaults: ["surfaceflinger_defaults"],
+ srcs: ["DdmConnection.cpp"],
+ shared_libs: [
+ "libcutils",
+ "libdl",
+ "liblog",
+ ],
+ product_variables: {
+ // uses jni which may not be available in PDK
+ pdk: {
+ enabled: false,
+ },
+ },
+}
+
+subdirs = [
+ "layerproto",
+ "tests",
+]
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
deleted file mode 100644
index 6c54ec3..0000000
--- a/services/surfaceflinger/Android.mk
+++ /dev/null
@@ -1,183 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_SRC_FILES := \
- Client.cpp \
- DisplayDevice.cpp \
- DispSync.cpp \
- EventControlThread.cpp \
- StartPropertySetThread.cpp \
- EventThread.cpp \
- FrameTracker.cpp \
- GpuService.cpp \
- Layer.cpp \
- BufferLayer.cpp \
- BufferLayerConsumer.cpp \
- ColorLayer.cpp \
- LayerRejecter.cpp \
- LayerVector.cpp \
- MessageQueue.cpp \
- MonitoredProducer.cpp \
- SurfaceFlinger.cpp \
- SurfaceInterceptor.cpp \
- SurfaceTracing.cpp \
- Transform.cpp \
- DisplayHardware/ComposerHal.cpp \
- DisplayHardware/FramebufferSurface.cpp \
- DisplayHardware/HWC2.cpp \
- DisplayHardware/HWComposer.cpp \
- DisplayHardware/HWComposerBufferCache.cpp \
- DisplayHardware/VirtualDisplaySurface.cpp \
- Effects/Daltonizer.cpp \
- EventLog/EventLogTags.logtags \
- EventLog/EventLog.cpp \
- RenderEngine/Description.cpp \
- RenderEngine/Image.cpp \
- RenderEngine/Mesh.cpp \
- RenderEngine/Program.cpp \
- RenderEngine/ProgramCache.cpp \
- RenderEngine/GLExtensions.cpp \
- RenderEngine/RenderEngine.cpp \
- RenderEngine/Surface.cpp \
- RenderEngine/Texture.cpp \
- RenderEngine/GLES20RenderEngine.cpp \
- LayerProtoHelper.cpp \
- RenderArea.cpp \
-
-LOCAL_MODULE := libsurfaceflinger
-LOCAL_C_INCLUDES := \
- frameworks/native/vulkan/include \
- external/vulkan-validation-layers/libs/vkjson \
- system/libhwbinder/fast_msgq/include \
-
-LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
-LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
-
-LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
-
-LOCAL_STATIC_LIBRARIES := \
- libtrace_proto \
- libvkjson \
- libvr_manager \
- libvrflinger \
- libserviceutils
-
-LOCAL_HEADER_LIBRARIES := \
- android.hardware.graphics.composer@2.1-command-buffer
-
-LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libserviceutils
-
-LOCAL_SHARED_LIBRARIES := \
- android.frameworks.vr.composer@1.0 \
- android.hardware.graphics.allocator@2.0 \
- android.hardware.graphics.composer@2.1 \
- android.hardware.configstore@1.0 \
- android.hardware.configstore-utils \
- libcutils \
- liblog \
- libdl \
- libfmq \
- libhardware \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- libutils \
- libEGL \
- libGLESv1_CM \
- libGLESv2 \
- libbinder \
- libui \
- libgui \
- libvulkan \
- libsync \
- libprotobuf-cpp-lite \
- libbase \
- android.hardware.power@1.0 \
- liblayers_proto
-
-LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \
- android.hardware.graphics.allocator@2.0 \
- android.hardware.graphics.composer@2.1 \
- libhidlbase \
- libhidltransport \
- libhwbinder
-
-LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -std=c++1z
-
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################################
-# build surfaceflinger's executable
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-
-LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic
-LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic
-LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
-
-LOCAL_INIT_RC := surfaceflinger.rc
-
-LOCAL_SRC_FILES := \
- main_surfaceflinger.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- android.frameworks.displayservice@1.0 \
- android.hardware.configstore@1.0 \
- android.hardware.configstore-utils \
- android.hardware.graphics.allocator@2.0 \
- libsurfaceflinger \
- libcutils \
- libdisplayservicehidl \
- liblog \
- libbinder \
- libhidlbase \
- libhidltransport \
- libutils \
- libui \
- libgui \
- libdl \
- liblayers_proto
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain
-LOCAL_STATIC_LIBRARIES := libtrace_proto \
- libserviceutils
-
-LOCAL_MODULE := surfaceflinger
-
-ifdef TARGET_32_BIT_SURFACEFLINGER
-LOCAL_32_BIT_ONLY := true
-endif
-
-LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -std=c++1z
-
-include $(BUILD_EXECUTABLE)
-
-###############################################################
-# uses jni which may not be available in PDK
-ifneq ($(wildcard libnativehelper/include),)
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-
-LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
-
-LOCAL_SRC_FILES := \
- DdmConnection.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- liblog \
- libdl
-
-LOCAL_MODULE := libsurfaceflinger_ddmconnection
-
-LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-
-include $(BUILD_SHARED_LIBRARY)
-endif # libnativehelper
-
-include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 1349bec..bde1a8e 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -316,6 +316,9 @@
friend class BufferLayer;
friend class MonitoredProducer;
+ // For unit tests
+ friend class TestableSurfaceFlinger;
+
// This value is specified in number of frames. Log frame stats at most
// every half hour.
enum { LOG_FRAME_STATS_PERIOD = 30*60*60 };
diff --git a/services/surfaceflinger/tests/Android.bp b/services/surfaceflinger/tests/Android.bp
new file mode 100644
index 0000000..7d3da32
--- /dev/null
+++ b/services/surfaceflinger/tests/Android.bp
@@ -0,0 +1,50 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_test {
+ name: "SurfaceFlinger_test",
+ defaults: ["surfaceflinger_defaults"],
+ tags: ["test"],
+ test_suites: ["device-tests"],
+ srcs: [
+ "Stress_test.cpp",
+ "SurfaceInterceptor_test.cpp",
+ "Transaction_test.cpp",
+ ],
+ data: ["SurfaceFlinger_test.filter"],
+ static_libs: [
+ "libtrace_proto",
+ ],
+ shared_libs: [
+ "libandroid",
+ "libbinder",
+ "libcutils",
+ "libEGL",
+ "libGLESv2",
+ "libgui",
+ "liblog",
+ "libprotobuf-cpp-full",
+ "libui",
+ "libutils",
+ ]
+
+}
+
+subdirs = [
+ "fakehwc",
+ "hwc2",
+ "unittests",
+ "vsync",
+ "waitforvsync",
+]
diff --git a/services/surfaceflinger/tests/Android.mk b/services/surfaceflinger/tests/Android.mk
deleted file mode 100644
index 43e22a0..0000000
--- a/services/surfaceflinger/tests/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Build the unit tests,
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_MODULE := SurfaceFlinger_test
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
- Transaction_test.cpp \
- Stress_test.cpp \
- SurfaceInterceptor_test.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libEGL \
- libGLESv2 \
- libbinder \
- libcutils \
- libgui \
- libprotobuf-cpp-full \
- libui \
- libutils \
- libandroid \
- liblog
-
-LOCAL_STATIC_LIBRARIES := libtrace_proto
-
-LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-
-LOCAL_TEST_DATA = SurfaceFlinger_test.filter
-
-# Build the binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
-# to integrate with auto-test framework.
-include $(BUILD_NATIVE_TEST)
-
-# Include subdirectory makefiles
-# ============================================================
-
-# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework
-# team really wants is to build the stuff defined by this makefile.
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/services/surfaceflinger/tests/fakehwc/Android.bp b/services/surfaceflinger/tests/fakehwc/Android.bp
index eeb0f54..8e0ba83 100644
--- a/services/surfaceflinger/tests/fakehwc/Android.bp
+++ b/services/surfaceflinger/tests/fakehwc/Android.bp
@@ -1,5 +1,8 @@
cc_test {
name: "sffakehwc_test",
+ defaults: ["surfaceflinger_defaults"],
+ tags: ["test"],
+ test_suites: ["device-tests"],
srcs: [
"FakeComposerClient.cpp",
"FakeComposerService.cpp",
@@ -7,36 +10,31 @@
"SFFakeHwc_test.cpp"
],
shared_libs: [
- "libcutils",
- "libutils",
- "libbinder",
- "libui",
- "libgui",
- "liblog",
- "libnativewindow",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0",
- "libhwbinder",
+ "libbase",
+ "libbinder",
+ "libcutils",
+ "libfmq",
+ "libgui",
"libhardware",
"libhidlbase",
- "libsync",
- "libfmq",
- "libbase",
"libhidltransport",
- "liblayers_proto"
+ "libhwbinder",
+ "liblayers_proto",
+ "liblog",
+ "libnativewindow",
+ "libsync",
+ "libui",
+ "libutils",
],
static_libs: [
"libhwcomposer-client",
- "libsurfaceflingerincludes",
"libtrace_proto",
"libgmock"
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
+ "libsurfaceflinger_headers",
],
- cppflags: [
- "-std=c++1z",
- ],
- tags: ["tests"],
- test_suites: ["device-tests"]
}
\ No newline at end of file
diff --git a/services/surfaceflinger/tests/hwc2/Android.bp b/services/surfaceflinger/tests/hwc2/Android.bp
new file mode 100644
index 0000000..e980522
--- /dev/null
+++ b/services/surfaceflinger/tests/hwc2/Android.bp
@@ -0,0 +1,56 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_test {
+ name: "test-hwc2",
+ defaults: ["surfaceflinger_defaults"],
+ tags: ["test"],
+ cflags: [
+ "-DEGL_EGLEXT_PROTOTYPES",
+ "-DGL_GLEXT_PROTOTYPES",
+ "-fno-builtin",
+ "-fstack-protector-all",
+ "-g",
+ "-Wextra",
+ ],
+ srcs: [
+ "Hwc2Test.cpp",
+ "Hwc2TestProperties.cpp",
+ "Hwc2TestLayer.cpp",
+ "Hwc2TestLayers.cpp",
+ "Hwc2TestBuffer.cpp",
+ "Hwc2TestClientTarget.cpp",
+ "Hwc2TestVirtualDisplay.cpp",
+ "Hwc2TestPixelComparator.cpp",
+ ],
+ static_libs: [
+ "libadf",
+ "libadfhwc",
+ "libbase",
+ "libmath",
+ ],
+ shared_libs: [
+ "android.hardware.graphics.common@1.0",
+ "libcutils",
+ "libEGL",
+ "libGLESv2",
+ "libgui",
+ "libhardware",
+ "libhwui",
+ "liblog",
+ "libsync",
+ "libui",
+ "libutils",
+ ],
+}
diff --git a/services/surfaceflinger/tests/hwc2/Android.mk b/services/surfaceflinger/tests/hwc2/Android.mk
deleted file mode 100644
index 010ac9c..0000000
--- a/services/surfaceflinger/tests/hwc2/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := test-hwc2
-LOCAL_MODULE_TAGS := tests
-LOCAL_CFLAGS += \
- -fstack-protector-all \
- -g \
- -Wall -Wextra \
- -Werror \
- -fno-builtin \
- -DEGL_EGLEXT_PROTOTYPES \
- -DGL_GLEXT_PROTOTYPES
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libutils \
- libhardware \
- libEGL \
- libGLESv2 \
- libui \
- libgui \
- liblog \
- libsync \
- libhwui \
- android.hardware.graphics.common@1.0
-LOCAL_STATIC_LIBRARIES := \
- libbase \
- libadf \
- libadfhwc \
- libmath
-LOCAL_SRC_FILES := \
- Hwc2Test.cpp \
- Hwc2TestProperties.cpp \
- Hwc2TestLayer.cpp \
- Hwc2TestLayers.cpp \
- Hwc2TestBuffer.cpp \
- Hwc2TestClientTarget.cpp \
- Hwc2TestVirtualDisplay.cpp \
- Hwc2TestPixelComparator.cpp
-
-include $(BUILD_NATIVE_TEST)
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
new file mode 100644
index 0000000..72e0a0f
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_test {
+ name: "libsurfaceflinger_unittest",
+ tags: ["test"],
+ defaults: ["libsurfaceflinger_defaults"],
+ test_suites: ["device-tests"],
+ srcs: [
+ ":libsurfaceflinger_sources",
+ "DisplayTransactionTest.cpp",
+ ],
+ static_libs: [
+ "libgmock",
+ ],
+ header_libs: [
+ "libsurfaceflinger_headers",
+ ],
+}
diff --git a/services/surfaceflinger/tests/unittests/AndroidTest.xml b/services/surfaceflinger/tests/unittests/AndroidTest.xml
new file mode 100644
index 0000000..5e8b03b
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for libsurfaceflinger_unittest">
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+ <option name="cleanup" value="true" />
+ <option name="push" value="libsurfaceflinger_unittest->/data/local/tmp/libsurfaceflinger_unittest" />
+ </target_preparer>
+ <option name="test-suite-tag" value="apct" />
+ <test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-device-path" value="/data/local/tmp" />
+ <option name="module-name" value="libsurfaceflinger_unittest" />
+ </test>
+</configuration>
diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
new file mode 100644
index 0000000..fc1b564
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#undef LOG_TAG
+#define LOG_TAG "LibSurfaceFlingerUnittests"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <log/log.h>
+
+#include "TestableSurfaceFlinger.h"
+
+namespace android {
+namespace {
+
+class DisplayTransactionTest : public testing::Test {
+protected:
+ DisplayTransactionTest();
+ ~DisplayTransactionTest() override;
+
+ void setupComposer(int virtualDisplayCount);
+ void setupPrimaryDisplay(int width, int height);
+
+ TestableSurfaceFlinger mFlinger;
+};
+
+DisplayTransactionTest::DisplayTransactionTest() {
+ const ::testing::TestInfo* const test_info =
+ ::testing::UnitTest::GetInstance()->current_test_info();
+ ALOGD("**** Setting up for %s.%s\n", test_info->test_case_name(), test_info->name());
+}
+
+DisplayTransactionTest::~DisplayTransactionTest() {
+ const ::testing::TestInfo* const test_info =
+ ::testing::UnitTest::GetInstance()->current_test_info();
+ ALOGD("**** Tearing down after %s.%s\n", test_info->test_case_name(), test_info->name());
+}
+
+TEST_F(DisplayTransactionTest, PlaceholderTrivialTest) {
+ auto result = mFlinger.getDefaultDisplayDeviceLocked();
+ EXPECT_EQ(nullptr, result.get());
+
+ EXPECT_EQ(nullptr, mFlinger.mutableBuiltinDisplays()[0].get());
+ mFlinger.mutableBuiltinDisplays()[0] = new BBinder();
+ EXPECT_NE(nullptr, mFlinger.mutableBuiltinDisplays()[0].get());
+}
+
+} // namespace
+} // namespace android
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
new file mode 100644
index 0000000..4aa59a5
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "DisplayDevice.h"
+#include "SurfaceFlinger.h"
+
+namespace android {
+
+class TestableSurfaceFlinger {
+public:
+ // Extend this as needed for accessing SurfaceFlinger private (and public)
+ // functions.
+
+ /* ------------------------------------------------------------------------
+ * Forwarding for functions being tested
+ */
+ auto getDefaultDisplayDeviceLocked() const { return mFlinger->getDefaultDisplayDeviceLocked(); }
+
+ auto processDisplayChangesLocked() { return mFlinger->processDisplayChangesLocked(); }
+
+ /* ------------------------------------------------------------------------
+ * Read-write access to private data to set up preconditions and assert
+ * post-conditions.
+ */
+ auto& mutableBuiltinDisplays() { return mFlinger->mBuiltinDisplays; }
+
+ sp<SurfaceFlinger> mFlinger = new SurfaceFlinger();
+};
+
+} // namespace android
diff --git a/services/surfaceflinger/tests/vsync/Android.bp b/services/surfaceflinger/tests/vsync/Android.bp
new file mode 100644
index 0000000..d04efda
--- /dev/null
+++ b/services/surfaceflinger/tests/vsync/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_binary {
+ name: "test-vsync-events",
+ defaults: ["surfaceflinger_defaults"],
+ tags: ["test"],
+ srcs: [
+ "vsync.cpp",
+ ],
+ shared_libs: [
+ "libbinder",
+ "libcutils",
+ "libgui",
+ "libui",
+ "libutils",
+ ]
+
+}
diff --git a/services/surfaceflinger/tests/vsync/Android.mk b/services/surfaceflinger/tests/vsync/Android.mk
deleted file mode 100644
index 8e41617..0000000
--- a/services/surfaceflinger/tests/vsync/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- vsync.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libutils \
- libbinder \
- libui \
- libgui
-
-LOCAL_MODULE:= test-vsync-events
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_CFLAGS := -Werror
-
-include $(BUILD_EXECUTABLE)
diff --git a/services/surfaceflinger/tests/waitforvsync/Android.bp b/services/surfaceflinger/tests/waitforvsync/Android.bp
new file mode 100644
index 0000000..cb6d0fd
--- /dev/null
+++ b/services/surfaceflinger/tests/waitforvsync/Android.bp
@@ -0,0 +1,26 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_binary {
+ name: "test-waitforvsync",
+ cflags: [
+ "-Werror",
+ ],
+ srcs: [
+ "waitforvsync.cpp",
+ ],
+ shared_libs: [
+ "libcutils",
+ ]
+}
diff --git a/services/surfaceflinger/tests/waitforvsync/Android.mk b/services/surfaceflinger/tests/waitforvsync/Android.mk
deleted file mode 100644
index 932d2be..0000000
--- a/services/surfaceflinger/tests/waitforvsync/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- waitforvsync.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
-
-LOCAL_MODULE:= test-waitforvsync
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_CFLAGS := -Werror
-
-include $(BUILD_EXECUTABLE)
diff --git a/services/surfaceflinger/version-script32.txt b/services/surfaceflinger/version-script32.txt
new file mode 100644
index 0000000..2340785
--- /dev/null
+++ b/services/surfaceflinger/version-script32.txt
@@ -0,0 +1,12 @@
+{
+global:
+ EnsureFrontOfChain;
+ AddSpecialSignalHandlerFn;
+ RemoveSpecialSignalHandlerFn;
+ bsd_signal;
+ sigaction;
+ signal;
+ sigprocmask;
+local:
+ *;
+};
diff --git a/services/surfaceflinger/version-script64.txt b/services/surfaceflinger/version-script64.txt
new file mode 100644
index 0000000..acf3630
--- /dev/null
+++ b/services/surfaceflinger/version-script64.txt
@@ -0,0 +1,11 @@
+{
+global:
+ EnsureFrontOfChain;
+ AddSpecialSignalHandlerFn;
+ RemoveSpecialSignalHandlerFn;
+ sigaction;
+ signal;
+ sigprocmask;
+local:
+ *;
+};