summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-05-10 05:18:22 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-10 05:18:22 +0200
commit46938bcf0cbd77b8543c3ae5779318748aee27e1 (patch)
treeed6726f3e0e123c98d2b4ad5ffcfe3f8d9b53b08
parentMerge "recovery: Use libverifier instead of rebuilding the sources." (diff)
parentMerge "otautil: Android.mk -> Android.bp" (diff)
downloadandroid_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar.gz
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar.bz2
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar.lz
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar.xz
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.tar.zst
android_bootable_recovery-46938bcf0cbd77b8543c3ae5779318748aee27e1.zip
Diffstat (limited to '')
-rw-r--r--Android.bp3
-rw-r--r--Android.mk1
-rw-r--r--otautil/Android.bp34
-rw-r--r--otautil/Android.mk33
4 files changed, 37 insertions, 34 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..f919ebc83
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+ "otautil",
+]
diff --git a/Android.mk b/Android.mk
index 0c3d4fdf2..1f69d5d5a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 \
diff --git a/otautil/Android.bp b/otautil/Android.bp
new file mode 100644
index 000000000..0b2314374
--- /dev/null
+++ b/otautil/Android.bp
@@ -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",
+ ],
+}
diff --git a/otautil/Android.mk b/otautil/Android.mk
deleted file mode 100644
index f7ca9a9ee..000000000
--- a/otautil/Android.mk
+++ /dev/null
@@ -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)