summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2016-07-21 16:15:31 -0500
committerDan Willemsen2016-07-21 16:15:31 -0500
commitc9c5e4b969de3f1ea4b6df1ffc06b8468641e051 (patch)
tree0df5b1688bbe082c1c9eb41b82a342da613cf663 /libcrypto_utils
parent02ccdc5db9bb39488a3fe22a907b3211c3a464b9 (diff)
downloadplatform-system-core-c9c5e4b969de3f1ea4b6df1ffc06b8468641e051.tar.gz
platform-system-core-c9c5e4b969de3f1ea4b6df1ffc06b8468641e051.tar.xz
platform-system-core-c9c5e4b969de3f1ea4b6df1ffc06b8468641e051.zip
Rename lib{crypto,ssl}-host to lib{crypto,ssl}
There's no need to use a different name for target and host moudles. In Soong, it's better to use the same for both, as target and host modules can be defined at the same time. Change-Id: I32ee5bbd54b16a4ed9d812db4da836e96b1e8654
Diffstat (limited to 'libcrypto_utils')
-rw-r--r--libcrypto_utils/Android.mk4
-rw-r--r--libcrypto_utils/tests/Android.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/libcrypto_utils/Android.mk b/libcrypto_utils/Android.mk
index 5e9763fe5..b6d220443 100644
--- a/libcrypto_utils/Android.mk
+++ b/libcrypto_utils/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := android_pubkey.c
31LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 31LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99
32LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 32LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
33LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 33LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
34LOCAL_SHARED_LIBRARIES := libcrypto-host 34LOCAL_SHARED_LIBRARIES := libcrypto
35include $(BUILD_HOST_SHARED_LIBRARY) 35include $(BUILD_HOST_SHARED_LIBRARY)
36 36
37include $(CLEAR_VARS) 37include $(CLEAR_VARS)
@@ -40,7 +40,7 @@ LOCAL_SRC_FILES := android_pubkey.c
40LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 40LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99
41LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 41LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
42LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 42LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
43LOCAL_STATIC_LIBRARIES := libcrypto_static 43LOCAL_STATIC_LIBRARIES := libcrypto
44include $(BUILD_STATIC_LIBRARY) 44include $(BUILD_STATIC_LIBRARY)
45 45
46include $(CLEAR_VARS) 46include $(CLEAR_VARS)
diff --git a/libcrypto_utils/tests/Android.mk b/libcrypto_utils/tests/Android.mk
index dad82f70f..bdaef71f2 100644
--- a/libcrypto_utils/tests/Android.mk
+++ b/libcrypto_utils/tests/Android.mk
@@ -20,5 +20,5 @@ include $(CLEAR_VARS)
20LOCAL_MODULE := libcrypto_utils_test 20LOCAL_MODULE := libcrypto_utils_test
21LOCAL_SRC_FILES := android_pubkey_test.cpp 21LOCAL_SRC_FILES := android_pubkey_test.cpp
22LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11 22LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11
23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto-host 23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto
24include $(BUILD_HOST_NATIVE_TEST) 24include $(BUILD_HOST_NATIVE_TEST)