diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2018-01-10 17:33:42 +0100 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-04-22 20:57:35 +0200 |
| commit | 43ee7e7354d941cce7862b29f2b33df0f8beca1b (patch) | |
| tree | e76c858ded54835fa9900085deffe97a512046ff | |
| parent | applypatch: Fix bad AOSP merge (diff) | |
| download | android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar.gz android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar.bz2 android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar.lz android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar.xz android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.tar.zst android_bootable_recovery-43ee7e7354d941cce7862b29f2b33df0f8beca1b.zip | |
| -rw-r--r-- | otafault/Android.mk | 10 | ||||
| -rw-r--r-- | tests/Android.mk | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk index 7d65b55f6..c40fc06dd 100644 --- a/otafault/Android.mk +++ b/otafault/Android.mk @@ -14,12 +14,6 @@ LOCAL_PATH := $(call my-dir) -ifdef project-path-for - RECOVERY_PATH := $(call project-path-for,recovery) -else - RECOVERY_PATH := bootable/recovery -endif - include $(CLEAR_VARS) otafault_static_libs := \ @@ -39,7 +33,7 @@ LOCAL_SRC_FILES := config.cpp ota_io.cpp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libotafault LOCAL_CLANG := true -LOCAL_C_INCLUDES := $(RECOVERY_PATH) +LOCAL_C_INCLUDES := $(commands_recovery_local_path) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs) @@ -54,7 +48,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE := otafault_test LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) LOCAL_CFLAGS := -Werror -LOCAL_C_INCLUDES := $(RECOVERY_PATH) +LOCAL_C_INCLUDES := $(commands_recovery_local_path) LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) diff --git a/tests/Android.mk b/tests/Android.mk index ff8f3a38e..097b633f7 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -16,12 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifdef project-path-for - RECOVERY_PATH := $(call project-path-for,recovery) -else - RECOVERY_PATH := bootable/recovery -endif - # Unit tests include $(CLEAR_VARS) LOCAL_CFLAGS := -Werror @@ -46,7 +40,7 @@ LOCAL_SRC_FILES := \ unit/sysutil_test.cpp \ unit/zip_test.cpp \ -LOCAL_C_INCLUDES := $(RECOVERY_PATH) +LOCAL_C_INCLUDES := $(commands_recovery_local_path) LOCAL_SHARED_LIBRARIES := liblog include $(BUILD_NATIVE_TEST) @@ -104,7 +98,7 @@ endif LOCAL_MODULE := recovery_component_test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_C_INCLUDES := $(RECOVERY_PATH) +LOCAL_C_INCLUDES := $(commands_recovery_local_path) LOCAL_SRC_FILES := \ component/applypatch_test.cpp \ component/bootloader_message_test.cpp \ |