From 871dda3d6485617bf3a1ea6c8236071212234433 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 25 Aug 2016 17:05:22 -0700 Subject: [PATCH] Convert libui to Android.bp Along with the libinput tests, which depend on libui. For more information on Soong, see build/soong/README.md Change-Id: Id4fbeb114d03e37556dca59a2c9f5c9abb0a1825 --- libs/input/Android.bp | 2 ++ libs/input/Android.mk | 24 --------------- libs/input/tests/Android.bp | 29 ++++++++++++++++++ libs/input/tests/Android.mk | 40 ------------------------- libs/ui/Android.bp | 69 +++++++++++++++++++++++++++++++++++++++++++ libs/ui/Android.mk | 71 --------------------------------------------- libs/ui/tests/Android.bp | 31 ++++++++++++++++++++ libs/ui/tests/Android.mk | 36 ----------------------- 8 files changed, 131 insertions(+), 171 deletions(-) delete mode 100644 libs/input/Android.mk create mode 100644 libs/input/tests/Android.bp delete mode 100644 libs/input/tests/Android.mk create mode 100644 libs/ui/Android.bp delete mode 100644 libs/ui/Android.mk create mode 100644 libs/ui/tests/Android.bp delete mode 100644 libs/ui/tests/Android.mk diff --git a/libs/input/Android.bp b/libs/input/Android.bp index 28df1cf6ed..bd28af14fc 100644 --- a/libs/input/Android.bp +++ b/libs/input/Android.bp @@ -58,3 +58,5 @@ cc_library { }, }, } + +subdirs = ["tests"] diff --git a/libs/input/Android.mk b/libs/input/Android.mk deleted file mode 100644 index e7dbe79ef9..0000000000 --- a/libs/input/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013 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 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/libs/input/tests/Android.bp b/libs/input/tests/Android.bp new file mode 100644 index 0000000000..f0b5edaf66 --- /dev/null +++ b/libs/input/tests/Android.bp @@ -0,0 +1,29 @@ +// Build the unit tests. +cc_test { + name: "libinput_tests", + test_per_src: true, + srcs: [ + "InputChannel_test.cpp", + "InputEvent_test.cpp", + "InputPublisherAndConsumer_test.cpp", + ], + shared_libs: [ + "libinput", + "libcutils", + "libutils", + "libbinder", + "libui", + ] +} + +// NOTE: This is a compile time test, and does not need to be +// run. All assertions are static_asserts and will fail during +// buildtime if something's wrong. +cc_library_static { + name: "StructLayout_test", + srcs: ["StructLayout_test.cpp"], + cflags: [ + "-std=c++11", + "-O0", + ], +} diff --git a/libs/input/tests/Android.mk b/libs/input/tests/Android.mk deleted file mode 100644 index 5bfa3d4808..0000000000 --- a/libs/input/tests/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Build the unit tests. -LOCAL_PATH:= $(call my-dir) - -# Build the unit tests. -test_src_files := \ - InputChannel_test.cpp \ - InputEvent_test.cpp \ - InputPublisherAndConsumer_test.cpp - -shared_libraries := \ - libinput \ - libcutils \ - libutils \ - libbinder \ - libui \ - -$(foreach file,$(test_src_files), \ - $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \ - $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ - $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ - $(eval LOCAL_SRC_FILES := $(file)) \ - $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ - $(eval include $(BUILD_NATIVE_TEST)) \ -) - -# NOTE: This is a compile time test, and does not need to be -# run. All assertions are static_asserts and will fail during -# buildtime if something's wrong. -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := StructLayout_test.cpp -LOCAL_MODULE := StructLayout_test -LOCAL_CFLAGS := -std=c++11 -O0 -LOCAL_MULTILIB := both -include $(BUILD_STATIC_LIBRARY) - - -# Build the manual test programs. -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp new file mode 100644 index 0000000000..0777468585 --- /dev/null +++ b/libs/ui/Android.bp @@ -0,0 +1,69 @@ +// Copyright (C) 2010 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_library_shared { + name: "libui", + + clang: true, + cppflags: [ + "-std=c++1y", + "-Weverything", + "-Werror", + + // The static constructors and destructors in this library have not been noted to + // introduce significant overheads + "-Wno-exit-time-destructors", + "-Wno-global-constructors", + + // We only care about compiling as C++14 + "-Wno-c++98-compat-pedantic", + + // We use four-character constants for the GraphicBuffer header, and don't care + // that they're non-portable as long as they're consistent within one execution + "-Wno-four-char-constants", + + // Don't warn about struct padding + "-Wno-padded", + ], + + sanitize: { + //misc_undefined: ["integer"], + }, + + srcs: [ + "Fence.cpp", + "FrameStats.cpp", + "Gralloc1.cpp", + "Gralloc1On0Adapter.cpp", + "GraphicBuffer.cpp", + "GraphicBufferAllocator.cpp", + "GraphicBufferMapper.cpp", + "HdrCapabilities.cpp", + "PixelFormat.cpp", + "Rect.cpp", + "Region.cpp", + "UiConfig.cpp", + ], + + shared_libs: [ + "libbinder", + "libcutils", + "libhardware", + "libsync", + "libutils", + "liblog", + ], +} + +subdirs = ["tests"] diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk deleted file mode 100644 index 5a30037a61..0000000000 --- a/libs/ui/Android.mk +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright (C) 2010 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_CLANG := true -LOCAL_CPPFLAGS := -std=c++1y -Weverything -Werror -# LOCAL_SANITIZE := integer - -# The static constructors and destructors in this library have not been noted to -# introduce significant overheads -LOCAL_CPPFLAGS += -Wno-exit-time-destructors -LOCAL_CPPFLAGS += -Wno-global-constructors - -# We only care about compiling as C++14 -LOCAL_CPPFLAGS += -Wno-c++98-compat-pedantic - -# We use four-character constants for the GraphicBuffer header, and don't care -# that they're non-portable as long as they're consistent within one execution -LOCAL_CPPFLAGS += -Wno-four-char-constants - -# Don't warn about struct padding -LOCAL_CPPFLAGS += -Wno-padded - -LOCAL_SRC_FILES := \ - Fence.cpp \ - FrameStats.cpp \ - Gralloc1.cpp \ - Gralloc1On0Adapter.cpp \ - GraphicBuffer.cpp \ - GraphicBufferAllocator.cpp \ - GraphicBufferMapper.cpp \ - HdrCapabilities.cpp \ - PixelFormat.cpp \ - Rect.cpp \ - Region.cpp \ - UiConfig.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbinder \ - libcutils \ - libhardware \ - libsync \ - libutils \ - liblog - -LOCAL_MODULE := libui - -include $(BUILD_SHARED_LIBRARY) - - -# 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/libs/ui/tests/Android.bp b/libs/ui/tests/Android.bp new file mode 100644 index 0000000000..8cdab8ccf8 --- /dev/null +++ b/libs/ui/tests/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright (C) 2014 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: "Region_test", + shared_libs: ["libui"], + srcs: ["Region_test.cpp"], +} + +cc_test { + name: "vec_test", + srcs: ["vec_test.cpp"], +} + +cc_test { + name: "mat_test", + srcs: ["mat_test.cpp"], +} diff --git a/libs/ui/tests/Android.mk b/libs/ui/tests/Android.mk deleted file mode 100644 index 6438b1f9a4..0000000000 --- a/libs/ui/tests/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2014 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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SHARED_LIBRARIES := libui -LOCAL_SRC_FILES := Region_test.cpp -LOCAL_MODULE := Region_test -include $(BUILD_NATIVE_TEST) - -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := vec_test.cpp -LOCAL_MODULE := vec_test -include $(BUILD_NATIVE_TEST) - -include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := mat_test.cpp -LOCAL_MODULE := mat_test -include $(BUILD_NATIVE_TEST) -- 2.11.0