Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40431688 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 17c0e737: am ce915d95: Merge "Never use ASAN for acp." 

* commit '17c0e737':
  Never use ASAN for acp.
parents 0a5105bd 17c0e737

libs/host/Android.mk

+3 −0
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

    CopyFile.c

    CopyFile.c
@@ -20,6 +21,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 
# acp to install libhost.

# acp to install libhost.

LOCAL_ACP_UNAVAILABLE:= true

LOCAL_ACP_UNAVAILABLE:= true





LOCAL_ADDRESS_SANITIZER := false



include $(BUILD_HOST_STATIC_LIBRARY)

include $(BUILD_HOST_STATIC_LIBRARY)





# Include toolchain prebuilt modules if they exist.

# Include toolchain prebuilt modules if they exist.

tools/acp/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 




LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

    acp.c

    acp.c
@@ -22,5 +23,6 @@ LOCAL_C_INCLUDES := build/libs/host/include 
LOCAL_MODULE := acp

LOCAL_MODULE := acp

LOCAL_ACP_UNAVAILABLE := true

LOCAL_ACP_UNAVAILABLE := true

LOCAL_CXX_STL := none

LOCAL_CXX_STL := none

LOCAL_ADDRESS_SANITIZER := false





include $(BUILD_HOST_EXECUTABLE)
 
include $(BUILD_HOST_EXECUTABLE)