diff options
Diffstat (limited to '')
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | boot_control/Android.bp | 37 | ||||
-rw-r--r-- | boot_control/Android.mk | 33 | ||||
-rw-r--r-- | tests/Android.mk | 2 | ||||
-rw-r--r-- | tests/component/resources_test.cpp | 9 | ||||
l--------- | tests/res-testdata/res-hdpi | 1 | ||||
l--------- | tests/res-testdata/res-mdpi | 1 | ||||
l--------- | tests/res-testdata/res-xhdpi | 1 | ||||
l--------- | tests/res-testdata/res-xxhdpi | 1 | ||||
l--------- | tests/res-testdata/res-xxxhdpi | 1 |
10 files changed, 48 insertions, 39 deletions
diff --git a/Android.mk b/Android.mk index 8d9094d8c..9888f8616 100644 --- a/Android.mk +++ b/Android.mk @@ -80,6 +80,5 @@ endif include $(BUILD_PHONY_PACKAGE) include \ - $(LOCAL_PATH)/boot_control/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/updater/Android.mk \ diff --git a/boot_control/Android.bp b/boot_control/Android.bp new file mode 100644 index 000000000..7720ead50 --- /dev/null +++ b/boot_control/Android.bp @@ -0,0 +1,37 @@ +// +// 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_library_shared { + name: "bootctrl.default", + recovery_available: true, + relative_install_path: "hw", + + srcs: ["boot_control.cpp"], + + cflags: [ + "-D_FILE_OFFSET_BITS=64", + "-Werror", + "-Wall", + "-Wextra", + ], + + shared_libs: [ + "libbase", + "libbootloader_message", + "libfs_mgr", + "liblog", + ], +} diff --git a/boot_control/Android.mk b/boot_control/Android.mk deleted file mode 100644 index 9814d7122..000000000 --- a/boot_control/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2017 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 := $(my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := bootctrl.bcb -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := boot_control.cpp -LOCAL_CFLAGS := \ - -D_FILE_OFFSET_BITS=64 \ - -Werror \ - -Wall \ - -Wextra -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr libbase -LOCAL_POST_INSTALL_CMD := \ - $(hide) mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/hw && \ - ln -sf bootctrl.bcb.so $(TARGET_OUT_SHARED_LIBRARIES)/hw/bootctrl.default.so -include $(BUILD_SHARED_LIBRARY) diff --git a/tests/Android.mk b/tests/Android.mk index 3d3e63e7e..ef64d76ab 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -208,7 +208,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_TEST_DATA := \ $(call find-test-data-in-subdirs, $(LOCAL_PATH), "*", testdata) \ - $(call find-test-data-in-subdirs, bootable/recovery, "*_text.png", res-*) + $(call find-test-data-in-subdirs, $(LOCAL_PATH), "*_text.png", res-testdata) include $(BUILD_NATIVE_TEST) # Host tests diff --git a/tests/component/resources_test.cpp b/tests/component/resources_test.cpp index 618d5a4dd..b00c3d528 100644 --- a/tests/component/resources_test.cpp +++ b/tests/component/resources_test.cpp @@ -32,10 +32,11 @@ static const std::string kLocale = "zu"; -static const std::vector<std::string> kResourceImagesDirs{ "res-mdpi/images/", "res-hdpi/images/", - "res-xhdpi/images/", - "res-xxhdpi/images/", - "res-xxxhdpi/images/" }; +static const std::vector<std::string> kResourceImagesDirs{ + "res-testdata/res-mdpi/images/", "res-testdata/res-hdpi/images/", + "res-testdata/res-xhdpi/images/", "res-testdata/res-xxhdpi/images/", + "res-testdata/res-xxxhdpi/images/", +}; static int png_filter(const dirent* de) { if (de->d_type != DT_REG || !android::base::EndsWith(de->d_name, "_text.png")) { diff --git a/tests/res-testdata/res-hdpi b/tests/res-testdata/res-hdpi new file mode 120000 index 000000000..c339b1df4 --- /dev/null +++ b/tests/res-testdata/res-hdpi @@ -0,0 +1 @@ +../../res-hdpi
\ No newline at end of file diff --git a/tests/res-testdata/res-mdpi b/tests/res-testdata/res-mdpi new file mode 120000 index 000000000..4be630d6f --- /dev/null +++ b/tests/res-testdata/res-mdpi @@ -0,0 +1 @@ +../../res-mdpi
\ No newline at end of file diff --git a/tests/res-testdata/res-xhdpi b/tests/res-testdata/res-xhdpi new file mode 120000 index 000000000..429eead83 --- /dev/null +++ b/tests/res-testdata/res-xhdpi @@ -0,0 +1 @@ +../../res-xhdpi
\ No newline at end of file diff --git a/tests/res-testdata/res-xxhdpi b/tests/res-testdata/res-xxhdpi new file mode 120000 index 000000000..304cc28b3 --- /dev/null +++ b/tests/res-testdata/res-xxhdpi @@ -0,0 +1 @@ +../../res-xxhdpi
\ No newline at end of file diff --git a/tests/res-testdata/res-xxxhdpi b/tests/res-testdata/res-xxxhdpi new file mode 120000 index 000000000..2236ad8cc --- /dev/null +++ b/tests/res-testdata/res-xxxhdpi @@ -0,0 +1 @@ +../../res-xxxhdpi
\ No newline at end of file |