commit af004a8a8ccd89b1edab91aca0f94851aa12100a
author bowgotsai <bowgotsai@google.com> Mon Oct 24 17:10:45 2016 +0800
committer bowgotsai <bowgotsai@google.com> Fri Oct 28 09:15:59 2016 +0800
tree c5d65ec782973900ac3f9ffb71673c189121053e
parent 0b7f1d3aadf8fcc79fff914480c7efcc3cfa4008

Build libavb as a static library

Also fix the following:
 - Typo of LOCAL_EXPORT_C_INCLUDE_DIRS
 - Clean up LOCAL_C_INCLUDES and just use LOCAL_EXPORT_C_INCLUDE_DIRS

Bug: 31264231
Test: system/core/fs_mgr can static links libavb
Test: Unit tests pass

Change-Id: Id747717ab682defe11217bb17b7b563a9396d578

Android.mk

diff --git a/Android.mk b/Android.mk
index 6f2f54d..30f0919 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,11 +54,10 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := libavb
 LOCAL_MODULE_HOST_OS := linux
-LOCAL_EXPORT_C_INDLUDE_DIRS := $(LOCAL_PATH)/libavb
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libavb
 LOCAL_CLANG := true
 LOCAL_CFLAGS := $(avb_common_cflags) -DAVB_ENABLE_DEBUG -DAVB_COMPILATION
 LOCAL_LDFLAGS := $(avb_common_ldflags)
-LOCAL_C_INCLUDES :=
 LOCAL_SRC_FILES := \
     libavb/avb_ab_flow.c \
     libavb/avb_chain_partition_descriptor.c \
@@ -77,17 +76,17 @@
     libavb/avb_sysdeps_posix.c \
     libavb/avb_util.c \
     libavb/avb_vbmeta_image.c
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 # Build for the host (for unit tests).
 include $(CLEAR_VARS)
 LOCAL_MODULE := libavb_host
 LOCAL_MODULE_HOST_OS := linux
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libavb
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_CLANG := true
 LOCAL_CFLAGS := $(avb_common_cflags) -fno-stack-protector -DAVB_ENABLE_DEBUG -DAVB_COMPILATION
 LOCAL_LDFLAGS := $(avb_common_ldflags)
-LOCAL_C_INCLUDES :=
 LOCAL_SRC_FILES := \
     libavb/avb_ab_flow.c \
     libavb/avb_chain_partition_descriptor.c \
@@ -109,12 +108,12 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libavb_host_sysdeps
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libavb
 LOCAL_MODULE_HOST_OS := linux
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_CLANG := true
 LOCAL_CFLAGS := $(avb_common_cflags) -DAVB_ENABLE_DEBUG -DAVB_COMPILATION
 LOCAL_LDFLAGS := $(avb_common_ldflags)
-LOCAL_C_INCLUDES :=
 LOCAL_SRC_FILES := \
     libavb/avb_sysdeps_posix.c
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -128,7 +127,6 @@
 LOCAL_CFLAGS := $(avb_common_cflags) -DAVB_ENABLE_DEBUG -DAVB_COMPILATION
 LOCAL_CPPFLAGS := $(avb_common_cppflags)
 LOCAL_LDFLAGS := $(avb_common_ldflags)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/libavb external/gtest/include
 LOCAL_STATIC_LIBRARIES := \
     libavb_host \
     libavb_host_sysdeps \
@@ -157,9 +155,8 @@
 LOCAL_CLANG := true
 LOCAL_CFLAGS := $(avb_common_cflags) -DAVB_COMPILATION
 LOCAL_LDFLAGS := $(avb_common_ldflags)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/libavb
-LOCAL_SHARED_LIBRARIES := libcutils libavb
-LOCAL_STATIC_LIBRARIES := libfs_mgr
+LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_STATIC_LIBRARIES := libavb libfs_mgr
 LOCAL_POST_INSTALL_CMD := \
 	$(hide) mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/hw && \
 	ln -sf bootctrl.avb.so $(TARGET_OUT_SHARED_LIBRARIES)/hw/bootctrl.default.so