diff options
author | Colin Cross <ccross@android.com> | 2017-04-25 10:53:34 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-05-03 14:45:52 -0700 |
commit | 84bd31a7020cf137a123731649996116e498a1cd (patch) | |
tree | 7effeae5f65a7a55acd123c7a31252c69c38b752 | |
parent | 4cab55f53581c3ecc2b080d5ce7f495458433a74 (diff) | |
download | minikin-n-iot-preview-4.tar.gz |
Convert frameworks/minikin/tests to Android.bpandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I930debdd129da7f61ac4b764980f73dfd487785d
Merged-In: I930debdd129da7f61ac4b764980f73dfd487785d
(cherry picked from commit 2bfc56ad2fcd0f65551a9c2ed8a9c2350f2e0cd1)
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | libs/minikin/Android.bp | 7 | ||||
-rw-r--r-- | tests/Android.bp | 86 | ||||
-rw-r--r-- | tests/Android.mk | 85 |
4 files changed, 94 insertions, 85 deletions
@@ -8,4 +8,5 @@ subdirs = [ "app", "libs/minikin", "sample", + "tests", ] diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp index 444bd9a..1109280 100644 --- a/libs/minikin/Android.bp +++ b/libs/minikin/Android.bp @@ -21,6 +21,13 @@ genrule { tool_files: ["unicode_emoji_h_gen.py"], } +cc_library_headers { + name: "libminikin-headers-for-tests", + export_include_dirs: ["."], + shared_libs: ["libharfbuzz_ng"], + export_shared_lib_headers: ["libharfbuzz_ng"], +} + cc_library { name: "libminikin", host_supported: true, diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..895cd2a --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,86 @@ +// Copyright (C) 2015 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. + +// see how_to_run.txt for instructions on running these tests + +cc_test { + name: "minikin_tests", + data: [ + "data/BoldItalic.ttf", + "data/Bold.ttf", + "data/ColorEmojiFont.ttf", + "data/ColorTextMixedEmojiFont.ttf", + "data/Emoji.ttf", + "data/Italic.ttf", + "data/Ja.ttf", + "data/Ko.ttf", + "data/NoGlyphFont.ttf", + "data/Regular.ttf", + "data/TextEmojiFont.ttf", + "data/VarioationSelectorTest-Regular.ttf", + "data/ZhHans.ttf", + "data/ZhHant.ttf", + "data/itemize.xml", + "data/emoji.xml", + ], + + static_libs: [ + "libminikin", + "libxml2", + ], + + // Shared libraries which are dependencies of minikin; these are not automatically + // pulled in by the build system (and thus sadly must be repeated). + shared_libs: [ + "libskia", + "libft2", + "libharfbuzz_ng", + "libicuuc", + "liblog", + "libutils", + "libz", + ], + + srcs: [ + "FontCollectionTest.cpp", + "FontCollectionItemizeTest.cpp", + "FontFamilyTest.cpp", + "FontLanguageListCacheTest.cpp", + "FontTestUtils.cpp", + "HbFontCacheTest.cpp", + "MinikinFontForTest.cpp", + "MinikinInternalTest.cpp", + "GraphemeBreakTests.cpp", + "LayoutUtilsTest.cpp", + "UnicodeUtils.cpp", + "WordBreakerTests.cpp", + ], + + header_libs: ["libminikin-headers-for-tests"], + + cppflags: [ + "-Werror", + "-Wall", + "-Wextra", + ], + + multilib: { + lib32: { + cppflags: ["-DkTestFontDir=\"/data/nativetest/minikin_tests/data/\""], + }, + lib64: { + cppflags: ["-DkTestFontDir=\"/data/nativetest64/minikin_tests/data/\""], + }, + }, +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 2f21532..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (C) 2015 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. - -# see how_to_run.txt for instructions on running these tests - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_TEST_DATA := \ - data/BoldItalic.ttf \ - data/Bold.ttf \ - data/ColorEmojiFont.ttf \ - data/ColorTextMixedEmojiFont.ttf \ - data/Emoji.ttf \ - data/Italic.ttf \ - data/Ja.ttf \ - data/Ko.ttf \ - data/NoGlyphFont.ttf \ - data/Regular.ttf \ - data/TextEmojiFont.ttf \ - data/VarioationSelectorTest-Regular.ttf \ - data/ZhHans.ttf \ - data/ZhHant.ttf \ - data/itemize.xml \ - data/emoji.xml - -LOCAL_MODULE := minikin_tests -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE_CLASS := NATIVE_TESTS - -LOCAL_STATIC_LIBRARIES := libminikin - -# Shared libraries which are dependencies of minikin; these are not automatically -# pulled in by the build system (and thus sadly must be repeated). - -LOCAL_SHARED_LIBRARIES := \ - libskia \ - libft2 \ - libharfbuzz_ng \ - libicuuc \ - liblog \ - libutils \ - libz - -LOCAL_STATIC_LIBRARIES += \ - libxml2 - -LOCAL_SRC_FILES += \ - FontCollectionTest.cpp \ - FontCollectionItemizeTest.cpp \ - FontFamilyTest.cpp \ - FontLanguageListCacheTest.cpp \ - FontTestUtils.cpp \ - HbFontCacheTest.cpp \ - MinikinFontForTest.cpp \ - MinikinInternalTest.cpp \ - GraphemeBreakTests.cpp \ - LayoutUtilsTest.cpp \ - UnicodeUtils.cpp \ - WordBreakerTests.cpp - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../libs/minikin/ \ - external/harfbuzz_ng/src \ - external/libxml2/include \ - external/skia/src/core - -LOCAL_CPPFLAGS += -Werror -Wall -Wextra - -LOCAL_CPPFLAGS_32 += -DkTestFontDir="\"/data/nativetest/minikin_tests/data/\"" -LOCAL_CPPFLAGS_64 += -DkTestFontDir="\"/data/nativetest64/minikin_tests/data/\"" - -include $(BUILD_NATIVE_TEST) |