summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:40 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:40 +0000
commit3c74fc35ba1a50892ebc4267ec80441706560063 (patch)
tree5824f963754f5e4690e67a6e15b9b5b01c74affd
parent84e704107fa25288010bf718fe6d63ea3086edff (diff)
downloadopenssl-3c74fc35ba1a50892ebc4267ec80441706560063.tar.gz
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py. Change-Id: Ib432a4c80cef78d025ab2da840dec3ff90bce11c
Diffstat
-rw-r--r--openssl.target.darwin-arm.mk2
-rw-r--r--openssl.target.darwin-arm64.mk2
-rw-r--r--openssl.target.darwin-mips.mk2
-rw-r--r--openssl.target.darwin-x86.mk2
-rw-r--r--openssl.target.darwin-x86_64.mk2
-rw-r--r--openssl.target.linux-arm.mk2
-rw-r--r--openssl.target.linux-arm64.mk2
-rw-r--r--openssl.target.linux-mips.mk2
-rw-r--r--openssl.target.linux-x86.mk2
-rw-r--r--openssl.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index fcdd1ca..f65c45b 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -677,6 +677,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -793,6 +794,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index 0758f48..30a6383 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -652,6 +652,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -751,6 +752,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 647aa9a..a0056aa 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -663,6 +663,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -771,6 +772,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 53f22b3..6b89fc4 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -678,6 +678,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -794,6 +795,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index d7a793f..1d79fe8 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -679,6 +679,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl/config/x64 \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
@@ -794,6 +795,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl/config/x64 \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index fcdd1ca..f65c45b 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -677,6 +677,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -793,6 +794,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk
index 0758f48..30a6383 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -652,6 +652,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -751,6 +752,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 647aa9a..a0056aa 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -663,6 +663,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -771,6 +772,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 53f22b3..6b89fc4 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -678,6 +678,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
@@ -794,6 +795,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl/crypto \
diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk
index d7a793f..1d79fe8 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -679,6 +679,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl/config/x64 \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
@@ -794,6 +795,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl/config/x64 \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH)/third_party/openssl/openssl \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:10:18 +0000