Merge "Fix ODR issues in ART."
This commit is contained in:
commit
dd50edcbe7
1 changed files with 2 additions and 2 deletions
|
|
@ -42,8 +42,8 @@ include $(BUILD_HOST_STATIC_LIBRARY)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_CPP_EXTENSION := .cc
|
LOCAL_CPP_EXTENSION := .cc
|
||||||
LOCAL_SRC_FILES := ${source_files}
|
LOCAL_SRC_FILES := ${source_files}
|
||||||
LOCAL_STATIC_LIBRARIES := libz libutils
|
LOCAL_STATIC_LIBRARIES := libutils
|
||||||
LOCAL_SHARED_LIBRARIES := liblog libbase
|
LOCAL_SHARED_LIBRARIES := libz-host liblog libbase
|
||||||
LOCAL_MODULE:= libziparchive-host
|
LOCAL_MODULE:= libziparchive-host
|
||||||
LOCAL_CFLAGS := -Werror
|
LOCAL_CFLAGS := -Werror
|
||||||
LOCAL_MULTILIB := both
|
LOCAL_MULTILIB := both
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue