Fixed a couple of Android makefiles to let voe and vie build properly.

Review URL: http://webrtc-codereview.appspot.com/278001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@928 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-10 18:10:25 +00:00
parent 13318ef422
commit b61c410347
2 changed files with 5 additions and 2 deletions
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -23,8 +23,9 @@ LOCAL_SRC_FILES := \
    aligned_malloc.cc \
    atomic32.cc \
    condition_variable.cc \
-    cpu.cc \
+    cpu_dummy.cc \
    cpu_features.cc \
+    cpu_info.cc \
    critical_section.cc \
    event.cc \
    file_impl.cc \
--- a/src/voice_engine/main/test/auto_test/Android.mk
+++ b/src/voice_engine/main/test/auto_test/Android.mk
@@ -17,11 +17,13 @@ include $(LOCAL_PATH)/../../../../../android-webrtc.mk
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
+    automated_mode.cc \
    voe_cpu_test.cc \
    voe_standard_test.cc \
    voe_stress_test.cc \
    voe_unit_test.cc \
-    voe_extended_test.cc 
+    voe_extended_test.cc \
+    voe_standard_integration_test.cc

 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \