summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2016-01-15 11:59:28 -0800
committerIan Pedowitz <ijpedowitz@google.com>2016-01-20 16:40:06 -0800
commit3ddfed9d0735e08932c6fa7c9057eb708da50f5a (patch)
tree35f13ce8c5816739db12da96a8a09e281d119928
parent3625229ad69685699a0b8ea1ab0e365c2fdcf27e (diff)
downloadlibchrome-3ddfed9d0735e08932c6fa7c9057eb708da50f5a.tar.gz
libchrome: Fix Android.mk file list
There were a few minor errors in source file list for the library's make file (missing extension, etc) and some unit tests were not compiling for sources that were included. (cherry picked from commit b7972fa941a92a43e7ed703ab262afeb7bcc2a5a) Change-Id: I9a42d3bbc1864fa24678ac66b28e0b3018cb4e73
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index e4a6c9db53..60083e4b9b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -78,6 +78,7 @@ libchromeCommonSrc := \
base/location.cc \
base/logging.cc \
base/md5.cc \
+ base/memory/aligned_memory.cc \
base/memory/ref_counted.cc \
base/memory/ref_counted_memory.cc \
base/memory/singleton.cc \
@@ -258,6 +259,7 @@ libchromeCommonUnittestSrc := \
base/lazy_instance_unittest.cc \
base/logging_unittest.cc \
base/md5_unittest.cc \
+ base/memory/aligned_memory_unittest.cc \
base/memory/linked_ptr_unittest.cc \
base/memory/ref_counted_memory_unittest.cc \
base/memory/ref_counted_unittest.cc \
@@ -293,7 +295,7 @@ libchromeCommonUnittestSrc := \
base/scoped_clear_errno_unittest.cc \
base/scoped_generic_unittest.cc \
base/security_unittest.cc \
- base/sequence_checker_unittest \
+ base/sequence_checker_unittest.cc \
base/sha1_unittest.cc \
base/stl_util_unittest.cc \
base/strings/string16_unittest.cc \
@@ -316,6 +318,7 @@ libchromeCommonUnittestSrc := \
base/test/multiprocess_test_android.cc \
base/test/opaque_ref_counted.cc \
base/test/scoped_locale.cc \
+ base/test/sequenced_worker_pool_owner.cc \
base/test/test_file_util.cc \
base/test/test_file_util_linux.cc \
base/test/test_file_util_posix.cc \