diff options
-rw-r--r-- | libfec/Android.mk | 5 | ||||
-rw-r--r-- | libfec/test/Android.mk | 4 | ||||
-rw-r--r-- | verity/Android.mk | 2 | ||||
-rw-r--r-- | verity/fec/Android.mk | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/libfec/Android.mk b/libfec/Android.mk index 0fbb7786..d37dcbf2 100644 --- a/libfec/Android.mk +++ b/libfec/Android.mk @@ -16,10 +16,11 @@ common_src_files := \ fec_process.cpp common_static_libraries := \ + libfec_rs \ libcrypto_utils \ libcrypto \ libcutils \ - libbase + libbase \ include $(CLEAR_VARS) LOCAL_CFLAGS := $(common_cflags) @@ -30,7 +31,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE := libfec LOCAL_SRC_FILES := $(common_src_files) LOCAL_STATIC_LIBRARIES := \ - libfec_rs \ libext4_utils_static \ libsquashfs_utils \ libcutils \ @@ -48,7 +48,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE := libfec LOCAL_SRC_FILES := $(common_src_files) LOCAL_STATIC_LIBRARIES := \ - libfec_rs_host \ libext4_utils_host \ libsquashfs_utils_host \ $(common_static_libraries) diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk index 4c872414..e76737f4 100644 --- a/libfec/test/Android.mk +++ b/libfec/test/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := test_read.cpp LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := \ libfec \ - libfec_rs_host \ + libfec_rs \ libcrypto_utils \ libcrypto \ libext4_utils_host \ @@ -25,7 +25,7 @@ LOCAL_SANITIZE := integer LOCAL_MODULE := fec_test_rs LOCAL_SRC_FILES := test_rs.c LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libfec_rs_host +LOCAL_STATIC_LIBRARIES := libfec_rs LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE LOCAL_C_INCLUDES += external/fec include $(BUILD_HOST_EXECUTABLE) diff --git a/verity/Android.mk b/verity/Android.mk index c4a4d2c8..5810eac7 100644 --- a/verity/Android.mk +++ b/verity/Android.mk @@ -47,7 +47,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SANITIZE := integer LOCAL_STATIC_LIBRARIES := \ libfec \ - libfec_rs_host \ + libfec_rs \ libcrypto_utils \ libcrypto \ libext4_utils_host \ diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk index 74469710..b3a4a990 100644 --- a/verity/fec/Android.mk +++ b/verity/fec/Android.mk @@ -14,7 +14,7 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto_utils \ libcrypto \ libfec \ - libfec_rs_host \ + libfec_rs \ libext4_utils_host \ libsquashfs_utils_host LOCAL_SHARED_LIBRARIES := libbase |