Add optional host version of openssl app
Can be invoked with out/host/linux-x86/bin/openssl
Change-Id: I993558d1096082ef116072afa212fa2b9b873a23
diff --git a/apps/Android.mk b/apps/Android.mk
index 06e07a2..20cc5a9 100644
--- a/apps/Android.mk
+++ b/apps/Android.mk
@@ -1,9 +1,8 @@
# Copyright 2006 The Android Open Source Project
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
+local_src_files:= \
app_rand.c \
apps.c \
asn1pars.c \
@@ -53,27 +52,36 @@
version.c \
x509.c
-# cms.c ec.c s_server.c
-
-LOCAL_SHARED_LIBRARIES := \
+local_shared_libraries := \
libssl \
- libcrypto
+ libcrypto
-LOCAL_C_INCLUDES := \
+local_c_includes := \
external/openssl \
external/openssl/include
-LOCAL_CFLAGS := -DMONOLITH
-
-include $(LOCAL_PATH)/../android-config.mk
+local_cflags := -DMONOLITH
# These flags omit whole features from the commandline "openssl".
# However, portions of these features are actually turned on.
-LOCAL_CFLAGS += -DOPENSSL_NO_DTLS1
+local_cflags += -DOPENSSL_NO_DTLS1
-
+include $(CLEAR_VARS)
LOCAL_MODULE:= openssl
-
-LOCAL_MODULE_TAGS := tests
-
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(local_src_files)
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
+LOCAL_C_INCLUDES := $(local_c_includes)
+LOCAL_CFLAGS := $(local_cflags)
+include $(LOCAL_PATH)/../android-config.mk
include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE:= openssl
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(local_src_files)
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
+LOCAL_C_INCLUDES := $(local_c_includes)
+LOCAL_CFLAGS := $(local_cflags)
+include $(LOCAL_PATH)/../android-config.mk
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/patches/apps_Android.mk b/patches/apps_Android.mk
index 06e07a2..20cc5a9 100644
--- a/patches/apps_Android.mk
+++ b/patches/apps_Android.mk
@@ -1,9 +1,8 @@
# Copyright 2006 The Android Open Source Project
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
+local_src_files:= \
app_rand.c \
apps.c \
asn1pars.c \
@@ -53,27 +52,36 @@
version.c \
x509.c
-# cms.c ec.c s_server.c
-
-LOCAL_SHARED_LIBRARIES := \
+local_shared_libraries := \
libssl \
- libcrypto
+ libcrypto
-LOCAL_C_INCLUDES := \
+local_c_includes := \
external/openssl \
external/openssl/include
-LOCAL_CFLAGS := -DMONOLITH
-
-include $(LOCAL_PATH)/../android-config.mk
+local_cflags := -DMONOLITH
# These flags omit whole features from the commandline "openssl".
# However, portions of these features are actually turned on.
-LOCAL_CFLAGS += -DOPENSSL_NO_DTLS1
+local_cflags += -DOPENSSL_NO_DTLS1
-
+include $(CLEAR_VARS)
LOCAL_MODULE:= openssl
-
-LOCAL_MODULE_TAGS := tests
-
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(local_src_files)
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
+LOCAL_C_INCLUDES := $(local_c_includes)
+LOCAL_CFLAGS := $(local_cflags)
+include $(LOCAL_PATH)/../android-config.mk
include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE:= openssl
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(local_src_files)
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
+LOCAL_C_INCLUDES := $(local_c_includes)
+LOCAL_CFLAGS := $(local_cflags)
+include $(LOCAL_PATH)/../android-config.mk
+include $(BUILD_HOST_EXECUTABLE)
