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

Merge "otautil: Android.mk -> Android.bp" am: 106ca8e93f am: 46938bcf0c

Browse source 
am: 09690020fb

Change-Id: I675758b9ee62128346bb04c80433728c00ea2bf7
This commit is contained in:
Steven Moreland 2017-05-10 03:28:22 +00:00 committed by android-build-merger
commit af47ef6529
4 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Android.bp Normal file
View file

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

1
Android.mk
View file

@ -190,7 +190,6 @@ include \
$(LOCAL_PATH)/minadbd/Android.mk \
$(LOCAL_PATH)/minui/Android.mk \
$(LOCAL_PATH)/otafault/Android.mk \
$(LOCAL_PATH)/otautil/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \
$(LOCAL_PATH)/uncrypt/Android.mk \

34
otautil/Android.bp Normal file
View file

@ -0,0 +1,34 @@
// 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.
cc_library_static {
name: "libotautil",
srcs: [
"SysUtil.cpp",
"DirUtil.cpp",
"ZipUtil.cpp",
"ThermalUtil.cpp",
],
static_libs: [
"libselinux",
"libbase",
],
cflags: [
"-Werror",
"-Wall",
],
}

33
otautil/Android.mk
View file

@ -1,33 +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_SRC_FILES := \
SysUtil.cpp \
DirUtil.cpp \
ZipUtil.cpp \
ThermalUtil.cpp
LOCAL_STATIC_LIBRARIES := \
libselinux \
libbase
LOCAL_MODULE := libotautil
LOCAL_CFLAGS := \
-Werror \
-Wall
include $(BUILD_STATIC_LIBRARY)