summaryrefslogtreecommitdiff
path: root/crypto-sources.mk
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-07-14 15:23:56 -0700
committerDan Willemsen <dwillemsen@google.com>2016-07-20 15:44:25 -0700
commit21986fbbffc52d777b872d0d1ceb9c654501b7d2 (patch)
tree3a44f2fe5cb9f1258e6953f374d21ae258f5f0ef /crypto-sources.mk
parent6e899c7d3f4c7bd6383a0ca171a50e95aa9d8e2d (diff)
downloadboringssl-21986fbbffc52d777b872d0d1ceb9c654501b7d2.tar.gz
Migrate from Android.mk to Android.bp
Change-Id: I0b04100ace8599c8734bee77f656aab04c06cce9
Diffstat (limited to 'crypto-sources.mk')
-rw-r--r--crypto-sources.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk
index a5b8ba37..31c163fd 100644
--- a/crypto-sources.mk
+++ b/crypto-sources.mk
@@ -1,16 +1,12 @@
+# Now used only by Trusty
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk
include $(LOCAL_PATH)/sources.mk
LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM
LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter
# Do not add in the architecture-specific files if we don't want to build assembly
-ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources)
-LOCAL_SRC_FILES_linux_x86_64 := $(linux_x86_64_sources)
-else
LOCAL_SRC_FILES_x86 := $(linux_x86_sources)
LOCAL_SRC_FILES_x86_64 := $(linux_x86_64_sources)
LOCAL_SRC_FILES_arm := $(linux_arm_sources)
LOCAL_SRC_FILES_arm64 := $(linux_aarch64_sources)
-endif
LOCAL_SRC_FILES += $(crypto_sources)