summaryrefslogtreecommitdiffstats
path: root/otafault/Android.mk
diff options
context:
space:
mode:
authorJed Estep <jestep@google.com>2015-12-16 01:04:53 +0100
committerJed Estep <jestep@google.com>2016-03-16 20:36:57 +0100
commitf73abf36bcfd433a3fdd1664a77e8e531346c1b1 (patch)
tree235463175ed36f8657848845f51aeb0eaa87e295 /otafault/Android.mk
parentMerge "otafault: Fix setting of have_eio_error." into nyc-dev (diff)
downloadandroid_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar.gz
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar.bz2
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar.lz
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar.xz
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.tar.zst
android_bootable_recovery-f73abf36bcfd433a3fdd1664a77e8e531346c1b1.zip
Diffstat (limited to '')
-rw-r--r--otafault/Android.mk43
1 files changed, 14 insertions, 29 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk
index 75617a146..7468de6c4 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -1,10 +1,10 @@
-# Copyright 2015 The ANdroid Open Source Project
+# 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
+# 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,
@@ -14,45 +14,30 @@
LOCAL_PATH := $(call my-dir)
-empty :=
-space := $(empty) $(empty)
-comma := ,
-
-ifneq ($(TARGET_INJECT_FAULTS),)
-TARGET_INJECT_FAULTS := $(subst $(comma),$(space),$(strip $(TARGET_INJECT_FAULTS)))
-endif
-
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ota_io.cpp
+otafault_static_libs := \
+ libminzip \
+ libz \
+ libselinux \
+
+LOCAL_SRC_FILES := config.cpp ota_io.cpp
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := libotafault
LOCAL_CLANG := true
-
-ifneq ($(TARGET_INJECT_FAULTS),)
-$(foreach ft,$(TARGET_INJECT_FAULTS),\
- $(eval LOCAL_CFLAGS += -DTARGET_$(ft)_FAULT=$(TARGET_$(ft)_FAULT_FILE)))
-LOCAL_CFLAGS += -Wno-unused-parameter
-LOCAL_CFLAGS += -DTARGET_INJECT_FAULTS
-endif
-
-LOCAL_STATIC_LIBRARIES := libc
+LOCAL_C_INCLUDES := bootable/recovery
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs)
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ota_io.cpp test.cpp
+LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := otafault_test
-LOCAL_STATIC_LIBRARIES := libc
+LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
+LOCAL_C_INCLUDES := bootable/recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-writable-strings
-
-ifneq ($(TARGET_INJECT_FAULTS),)
-$(foreach ft,$(TARGET_INJECT_FAULTS),\
- $(eval LOCAL_CFLAGS += -DTARGET_$(ft)_FAULT=$(TARGET_$(ft)_FAULT_FILE)))
-LOCAL_CFLAGS += -DTARGET_INJECT_FAULTS
-endif
include $(BUILD_EXECUTABLE)