summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-05-18 22:34:48 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-18 22:34:48 +0200
commiteefefc6c1369e3df05a55a513119909e8abd14d9 (patch)
treeadf4505b758472a0547d65dd5886309cc02f2340
parentFix the input parameter for "set_retry_bootloader_message" (diff)
parentMerge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 (diff)
downloadandroid_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar.gz
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar.bz2
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar.lz
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar.xz
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.tar.zst
android_bootable_recovery-eefefc6c1369e3df05a55a513119909e8abd14d9.zip
-rw-r--r--Android.bp1
-rw-r--r--Android.mk1
-rw-r--r--bootloader_message/Android.bp26
-rw-r--r--bootloader_message/Android.mk25
4 files changed, 27 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp
index f919ebc83..49438ad9e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,4 @@
subdirs = [
+ "bootloader_message",
"otautil",
]
diff --git a/Android.mk b/Android.mk
index 1f69d5d5a..e619db031 100644
--- a/Android.mk
+++ b/Android.mk
@@ -185,7 +185,6 @@ include $(BUILD_STATIC_LIBRARY)
include \
$(LOCAL_PATH)/applypatch/Android.mk \
$(LOCAL_PATH)/boot_control/Android.mk \
- $(LOCAL_PATH)/bootloader_message/Android.mk \
$(LOCAL_PATH)/edify/Android.mk \
$(LOCAL_PATH)/minadbd/Android.mk \
$(LOCAL_PATH)/minui/Android.mk \
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp
new file mode 100644
index 000000000..f0d76e718
--- /dev/null
+++ b/bootloader_message/Android.bp
@@ -0,0 +1,26 @@
+//
+// 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.
+//
+
+cc_library_static {
+ name: "libbootloader_message",
+ srcs: ["bootloader_message.cpp"],
+ cppflags: ["-Werror"],
+ static_libs: [
+ "libbase",
+ "libfs_mgr",
+ ],
+ export_include_dirs: ["include"],
+}
diff --git a/bootloader_message/Android.mk b/bootloader_message/Android.mk
deleted file mode 100644
index a8c50819b..000000000
--- a/bootloader_message/Android.mk
+++ /dev/null
@@ -1,25 +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_CLANG := true
-LOCAL_SRC_FILES := bootloader_message.cpp
-LOCAL_MODULE := libbootloader_message
-LOCAL_STATIC_LIBRARIES := libbase libfs_mgr
-LOCAL_CFLAGS := -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-include $(BUILD_STATIC_LIBRARY)