am 4530e04d: Merge "Add LOCAL_EXPORT_C_INCLUDE_DIRS to Crypto and SSL config mk"
* commit '4530e04dbfbc9d76d7b7ca537f9a18b9e1c76524':
Add LOCAL_EXPORT_C_INCLUDE_DIRS to Crypto and SSL config mk
diff --git a/Crypto-config-host.mk b/Crypto-config-host.mk
index 50b889a..2a223f5 100644
--- a/Crypto-config-host.mk
+++ b/Crypto-config-host.mk
@@ -11,6 +11,7 @@
# LOCAL_CFLAGS_$(TARGET_ARCH)
# LOCAL_CFLAGS_$(TARGET_2ND_ARCH)
# LOCAL_ADDITIONAL_DEPENDENCIES
+# LOCAL_EXPORT_C_INCLUDE_DIRS
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Crypto-config-host.mk
@@ -712,6 +713,8 @@
# "Temporary" hack until this can be fixed in openssl.config
x86_64_cflags += -DRC4_INT="unsigned int"
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes)
diff --git a/Crypto-config-target.mk b/Crypto-config-target.mk
index 00682c0..bb4b543 100644
--- a/Crypto-config-target.mk
+++ b/Crypto-config-target.mk
@@ -11,6 +11,7 @@
# LOCAL_CFLAGS_$(TARGET_ARCH)
# LOCAL_CFLAGS_$(TARGET_2ND_ARCH)
# LOCAL_ADDITIONAL_DEPENDENCIES
+# LOCAL_EXPORT_C_INCLUDE_DIRS
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Crypto-config-target.mk
@@ -712,6 +713,8 @@
# "Temporary" hack until this can be fixed in openssl.config
x86_64_cflags += -DRC4_INT="unsigned int"
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(common_c_includes)
diff --git a/Crypto-config-trusty.mk b/Crypto-config-trusty.mk
index c1b01d5..0504bad 100644
--- a/Crypto-config-trusty.mk
+++ b/Crypto-config-trusty.mk
@@ -11,6 +11,7 @@
# LOCAL_CFLAGS_$(TARGET_ARCH)
# LOCAL_CFLAGS_$(TARGET_2ND_ARCH)
# LOCAL_ADDITIONAL_DEPENDENCIES
+# LOCAL_EXPORT_C_INCLUDE_DIRS
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Crypto-config-trusty.mk
@@ -253,6 +254,8 @@
mips_exclude_files :=
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(common_c_includes)
diff --git a/Ssl-config-host.mk b/Ssl-config-host.mk
index 83c6026..47850f6 100644
--- a/Ssl-config-host.mk
+++ b/Ssl-config-host.mk
@@ -11,6 +11,7 @@
# LOCAL_CFLAGS_$(TARGET_ARCH)
# LOCAL_CFLAGS_$(TARGET_2ND_ARCH)
# LOCAL_ADDITIONAL_DEPENDENCIES
+# LOCAL_EXPORT_C_INCLUDE_DIRS
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Ssl-config-host.mk
@@ -109,6 +110,8 @@
mips_exclude_files :=
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes)
diff --git a/Ssl-config-target.mk b/Ssl-config-target.mk
index 4652673..7b99430 100644
--- a/Ssl-config-target.mk
+++ b/Ssl-config-target.mk
@@ -11,6 +11,7 @@
# LOCAL_CFLAGS_$(TARGET_ARCH)
# LOCAL_CFLAGS_$(TARGET_2ND_ARCH)
# LOCAL_ADDITIONAL_DEPENDENCIES
+# LOCAL_EXPORT_C_INCLUDE_DIRS
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Ssl-config-target.mk
@@ -109,6 +110,8 @@
mips_exclude_files :=
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(common_c_includes)
diff --git a/import_openssl.sh b/import_openssl.sh
index 1844c5b..c604088 100755
--- a/import_openssl.sh
+++ b/import_openssl.sh
@@ -423,8 +423,11 @@
# LOCAL_SRC_FILES_\$(TARGET_2ND_ARCH)
# LOCAL_CFLAGS_\$(TARGET_ARCH)
# LOCAL_CFLAGS_\$(TARGET_2ND_ARCH)
-# LOCAL_ADDITIONAL_DEPENDENCIES
-
+# LOCAL_ADDITIONAL_DEPENDENCIES"
+if [ $prefix != "APPS" ] ; then
+ echo "# LOCAL_EXPORT_C_INCLUDE_DIRS"
+fi
+echo "
LOCAL_ADDITIONAL_DEPENDENCIES += \$(LOCAL_PATH)/$(basename $output)
"
@@ -459,6 +462,11 @@
x86_64_cflags += -DRC4_INT=\"unsigned int\""
fi
+ if [ $prefix != "APPS" ] ; then
+ echo "
+LOCAL_EXPORT_C_INCLUDE_DIRS := \$(LOCAL_PATH)/include"
+ fi
+
if [ $3 == "target" ]; then
echo "
LOCAL_CFLAGS += \$(common_cflags)
