SF: Convert to Android.bp
Eliminate the makefiles and convert to using blueprint files for
SurfaceFlinger. Along the way, set up a few things (filegroups,
cc_defaults) to add a unit test build in a change to come.
One configuration feature was dropped, as I was unsure of how to
replicate it in the blueprint configuration:
TARGET_32_BIT_SURFACEFLINGER
Test: Builds, usable on Pixel XL
Test: "atest SurfaceFlinger_test" works (but has failing tests)
Bug: None
Change-Id: I2d574855e53932fbb021afc9d61c4a3bb317330c
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)