From ac27a7a98733ea2444eedacfd2d8dd4a384726f6 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 28 Sep 2017 17:43:53 -0700
Subject: otafault: Clean up header inclusion.

Remove unneeded #includes. Also remove unneeded dependency on libz and
libselinux.

Test: mmma bootable/recovery
Change-Id: Ic8f7f46f4b89762dee384921504489de75320ac0
---
 otafault/Android.mk | 2 --
 1 file changed, 2 deletions(-)

(limited to 'otafault/Android.mk')

diff --git a/otafault/Android.mk b/otafault/Android.mk
index 4784d56ef..383717612 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -18,8 +18,6 @@ include $(CLEAR_VARS)
 
 otafault_static_libs := \
     libziparchive \
-    libz \
-    libselinux \
     libbase \
     liblog
 
-- 
cgit v1.2.3


From 646b05a66c52502835d7c301b68b2ebfc4af7e41 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 28 Sep 2017 17:43:53 -0700
Subject: otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.

Commit d80a99883d5ae2b117c54f076fe1df7eae86d2f8 has explanation of
potential issues.

Test: mmma bootable/recovery
Change-Id: I25ca9920952b7bbdd8a661d9dc90962431410bc4
---
 otafault/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'otafault/Android.mk')

diff --git a/otafault/Android.mk b/otafault/Android.mk
index 383717612..3e14f77f3 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -33,7 +33,7 @@ LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libotafault
 LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs)
+LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
 
 include $(BUILD_STATIC_LIBRARY)
 
-- 
cgit v1.2.3


From d33b2f86b79573ccf73fd211d0813b2663fafd38 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 28 Sep 2017 21:29:11 -0700
Subject: otafault: Move headers under otafault/.

Test: mmma bootable/recovery
Change-Id: I3ceb72f703c7c2857d656c137d71baa1fccd8238
---
 otafault/Android.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'otafault/Android.mk')

diff --git a/otafault/Android.mk b/otafault/Android.mk
index 3e14f77f3..5ec8a192a 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -31,8 +31,8 @@ LOCAL_CFLAGS := \
 LOCAL_SRC_FILES := config.cpp ota_io.cpp
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libotafault
-LOCAL_C_INCLUDES := bootable/recovery
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
 
 include $(BUILD_STATIC_LIBRARY)
@@ -41,12 +41,13 @@ include $(BUILD_STATIC_LIBRARY)
 # ===============================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp
+LOCAL_SRC_FILES := test.cpp
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := otafault_test
-LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
+LOCAL_STATIC_LIBRARIES := \
+    libotafault \
+    $(otafault_static_libs)
 LOCAL_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
 include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3


From a26e32d2a366c8319944b2ac887a175a870f034d Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 28 Sep 2017 18:46:19 -0700
Subject: otafault: Move to soong.

Test: mmma bootable/recovery
Change-Id: I5f2520ea457ba66743aa3aa1d5b3b488a93084a3
---
 otafault/Android.mk | 53 -----------------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 otafault/Android.mk

(limited to 'otafault/Android.mk')

diff --git a/otafault/Android.mk b/otafault/Android.mk
deleted file mode 100644
index 5ec8a192a..000000000
--- a/otafault/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2015 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 languae governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-otafault_static_libs := \
-    libziparchive \
-    libbase \
-    liblog
-
-LOCAL_CFLAGS := \
-    -Wall \
-    -Werror \
-    -Wthread-safety \
-    -Wthread-safety-negative \
-    -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
-
-LOCAL_SRC_FILES := config.cpp ota_io.cpp
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE := libotafault
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
-
-include $(BUILD_STATIC_LIBRARY)
-
-# otafault_test (static executable)
-# ===============================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := test.cpp
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := otafault_test
-LOCAL_STATIC_LIBRARIES := \
-    libotafault \
-    $(otafault_static_libs)
-LOCAL_CFLAGS := -Wall -Werror
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-
-include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3