diff options
| author | Jed Estep <jestep@google.com> | 2016-03-21 22:40:15 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-21 22:40:15 +0100 |
| commit | 9d8a68099f7fe62a1af454169fdd3b55d935af85 (patch) | |
| tree | 8d25cd03a59fb31e625f480a6b59e3238de36c94 /otafault/Android.mk | |
| parent | Merge "Fix: full ota package larger than 2GB fails to upgrade" am: 867e60d (diff) | |
| parent | Control fault injection with config files instead of build flags (diff) | |
| download | android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar.gz android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar.bz2 android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar.lz android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar.xz android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.tar.zst android_bootable_recovery-9d8a68099f7fe62a1af454169fdd3b55d935af85.zip | |
Diffstat (limited to '')
| -rw-r--r-- | otafault/Android.mk | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk index d441a7752..33308c76e 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,29 +14,20 @@ 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) @@ -44,17 +35,11 @@ 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) |