diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2018-01-15 09:45:25 -0600 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-01-23 16:27:07 +0000 |
| commit | ecc873e4da606e9985b6aaa5c36ec5b23251e2ac (patch) | |
| tree | aaa1902ee469828e2003ef656ec203b121cc757d | |
| parent | 7369878ba0949b7889f378a1c5eeb3040f533756 (diff) | |
| download | android_bootable_recovery-ecc873e4da606e9985b6aaa5c36ec5b23251e2ac.tar.gz android_bootable_recovery-ecc873e4da606e9985b6aaa5c36ec5b23251e2ac.tar.bz2 android_bootable_recovery-ecc873e4da606e9985b6aaa5c36ec5b23251e2ac.zip | |
Revert "libbootloader_message: convert to Android.bp"
This reverts commit 600e80638493dc8bde9c7102d5adae2272e034e9.
Change-Id: Ie7a0f60a06b05ede05c5988c53c3562563473d27
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | bootloader_message/Android.bp | 26 | ||||
| -rw-r--r-- | bootloader_message/Android.mk | 25 |
4 files changed, 26 insertions, 27 deletions
@@ -1,4 +1,3 @@ subdirs = [ - "bootloader_message", "otautil", ] @@ -259,6 +259,7 @@ 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 deleted file mode 100644 index f0d76e71..00000000 --- a/bootloader_message/Android.bp +++ /dev/null @@ -1,26 +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. -// - -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 new file mode 100644 index 00000000..a8c50819 --- /dev/null +++ b/bootloader_message/Android.mk @@ -0,0 +1,25 @@ +# 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) |