summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk6
-rw-r--r--base/third_party/dmg_fp/Android.mk19
-rw-r--r--base/third_party/dmg_fp/MODULE_LICENSE_BSD_LIKE0
-rw-r--r--base/third_party/dmg_fp/NOTICE18
-rw-r--r--base/third_party/dmg_fp/ThirdPartyProject.prop7
5 files changed, 46 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 6f0eafd..6eeb864 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,7 @@
LOCAL_PATH := $(call my-dir)
include external/chromium/third_party/libevent/Android.mk
include external/chromium/third_party/modp_b64/Android.mk
+include external/chromium/base/third_party/dmg_fp/Android.mk
include $(CLEAR_VARS)
@@ -123,9 +124,6 @@ LOCAL_SRC_FILES := \
base/metrics/stats_counters.cc \
base/metrics/stats_table.cc \
\
- base/third_party/dmg_fp/dtoa.cc \
- base/third_party/dmg_fp/g_fmt.cc \
- \
base/third_party/icu/icu_utf.cc \
\
base/third_party/nspr/prtime.cc \
@@ -469,7 +467,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_C_INCLUDES)
#LOCAL_STATIC_LIBRARIES += libevent
-LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite modp_b64
+LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite modp_b64 dmg_fp
# Including this will modify the include path
include external/stlport/libstlport.mk
diff --git a/base/third_party/dmg_fp/Android.mk b/base/third_party/dmg_fp/Android.mk
new file mode 100644
index 0000000..af0fab0
--- /dev/null
+++ b/base/third_party/dmg_fp/Android.mk
@@ -0,0 +1,19 @@
+####################################
+# Build dmg_fp as separate library
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_MODULE:= dmg_fp
+
+LOCAL_SRC_FILES := \
+ base/third_party/dmg_fp/dtoa.cc \
+ base/third_party/dmg_fp/g_fmt.cc
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/base/third_party/dmg_fp
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/base/third_party/dmg_fp/MODULE_LICENSE_BSD_LIKE b/base/third_party/dmg_fp/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/base/third_party/dmg_fp/MODULE_LICENSE_BSD_LIKE
diff --git a/base/third_party/dmg_fp/NOTICE b/base/third_party/dmg_fp/NOTICE
new file mode 100644
index 0000000..716f1ef
--- /dev/null
+++ b/base/third_party/dmg_fp/NOTICE
@@ -0,0 +1,18 @@
+/****************************************************************
+ *
+ * The author of this software is David M. Gay.
+ *
+ * Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ ***************************************************************/
diff --git a/base/third_party/dmg_fp/ThirdPartyProject.prop b/base/third_party/dmg_fp/ThirdPartyProject.prop
new file mode 100644
index 0000000..0a3cc6a
--- /dev/null
+++ b/base/third_party/dmg_fp/ThirdPartyProject.prop
@@ -0,0 +1,7 @@
+# Copyright 2011 Google Inc. All Rights Reserved.
+version=n/a
+isNative=true
+name=dmg_fp
+onDevice=true
+homepage=http://www.netlib.org/fp/dtoa.c
+