otafault/tests: Replace pathmap with commands_recovery_local_path

* This is used everywhere else now in TWRP

Change-Id: I4dd0bab1980ea34fabfd2949474bd62ed07d1d3c
This commit is contained in:
Michael Bestas
2018-01-10 18:33:42 +02:00
parent 608d566fd3
commit 43ee7e7354
2 changed files with 4 additions and 16 deletions
+2 -8
View File
@@ -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)
+2 -8
View File
@@ -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 \