aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Arnold <garnold@google.com>2015-09-01 17:04:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 17:04:48 +0000
commit365b9eb41fcd7d614f14c3afa585c20716a8aefd (patch)
tree9161cfe97b6adf46b2b292f54fff87f6f91a4cf3
parent9102b43b02ca43d585fbbdbbe6df03f6fbbf5b8e (diff)
parent6b0a9342d07cce9b66dea2d3230f9bdadb9d44d9 (diff)
downloadtlsdate-365b9eb41fcd7d614f14c3afa585c20716a8aefd.tar.gz
am 6b0a9342: Build tlsdate-helper in AOSP.
* commit '6b0a9342d07cce9b66dea2d3230f9bdadb9d44d9': Build tlsdate-helper in AOSP.
-rw-r--r--Android.mk34
1 files changed, 24 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 889cf79..486f0e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,16 +51,30 @@ $(eval $(tlsdate_common))
include $(BUILD_EXECUTABLE)
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := tlsdate-helper
-#LOCAL_SRC_FILES := \
-# src/proxy-bio.c \
-# src/seccomp.c \
-# src/tlsdate-helper.c \
-# src/util.c
-#LOCAL_SHARED_LIBRARIES := libcrypto libevent
-#$(eval $(tlsdate_common))
-#include $(BUILD_EXECUTABLE)
+include $(CLEAR_VARS)
+LOCAL_MODULE := tlsdate-helper
+LOCAL_SRC_FILES := \
+ src/compat/clock-linux.c \
+ src/proxy-bio.c \
+ src/seccomp.c \
+ src/tlsdate-helper.c \
+ src/util.c
+LOCAL_SHARED_LIBRARIES := libcrypto libevent libssl
+$(eval $(tlsdate_common))
+include $(BUILD_EXECUTABLE)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := tlsdate_proxy-bio_unittest
+LOCAL_SRC_FILES := \
+ src/proxy-bio-unittest.c \
+ src/proxy-bio.c \
+ src/seccomp.c \
+ src/test-bio.c \
+ src/util.c
+LOCAL_SHARED_LIBRARIES := $(tlsdate_common_shared_libs)
+$(eval $(tlsdate_common))
+include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS)