Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 07b4339b: Merge "Change androidfw tests to native test target"

Browse Source 
* commit '07b4339b2a2f39c17194b21dc301c0c026a2f197':
  Change androidfw tests to native test target
This commit is contained in:
Kenny Root
2012-10-02 13:08:45 -07:00
committed by Android Git Automerger
parent bad71217b7 07b4339b2a
commit cee1124052
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/androidfw/tests/Android.mk
View File

@@ -22,24 +22,13 @@ static_libraries := \
libgtest \ libgtest \
libgtest_main libgtest_main
c_includes := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
external/skia/include/core
module_tags := eng tests
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
$(eval LOCAL_C_INCLUDES := $(c_includes)) \
$(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval include $(BUILD_NATIVE_TEST)) \
$(eval include $(BUILD_EXECUTABLE)) \
) )
# Build the manual test programs. # Build the manual test programs.

2
libs/androidfw/tests/InputEvent_test.cpp
View File

@@ -19,7 +19,7 @@
#include <binder/Parcel.h> #include <binder/Parcel.h>
#include <math.h> #include <math.h>
#include <SkMatrix.h> #include <core/SkMatrix.h>
namespace android { namespace android {