tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926

Browse source 
am: 01bcf118d5

Change-Id: Ie9103aedc7c0b61d505023238e0cb0ab327f7e84
This commit is contained in:
Tom Cherry 2017-05-18 20:34:48 +00:00 committed by android-build-merger
commit eefefc6c13
4 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Android.bp
View file

@ -1,3 +1,4 @@
subdirs = [ subdirs = [
"bootloader_message",
"otautil", "otautil",
] ]

1
Android.mk
View file

@ -185,7 +185,6 @@ include $(BUILD_STATIC_LIBRARY)
include \ include \
$(LOCAL_PATH)/applypatch/Android.mk \ $(LOCAL_PATH)/applypatch/Android.mk \
$(LOCAL_PATH)/boot_control/Android.mk \ $(LOCAL_PATH)/boot_control/Android.mk \
$(LOCAL_PATH)/bootloader_message/Android.mk \
$(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/edify/Android.mk \
$(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \
$(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \

26
bootloader_message/Android.bp Normal file
View file

@ -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"],
}

25
bootloader_message/Android.mk
View file

@ -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)