Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f286df authored by Kenny Root's avatar Kenny Root
Browse files

Change androidfw tests to native test target 

Change the androidfw tests to the BUILD_NATIVE_TEST target so they end
up in the correct directory. Also remove the module tags and C include
paths. The include paths are automatically added when the library is
used.

Change-Id: Ia47f6c25130c5068b89d6dc067e5d9c714a6d08a
parent 77728b01

libs/androidfw/tests/Android.mk

+10 −21
Original line number Diff line number Diff line
@@ -22,24 +22,13 @@ static_libraries := \ 
    libgtest \

    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), \

    $(eval include $(CLEAR_VARS)) \

    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \

    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \

    $(eval LOCAL_C_INCLUDES := $(c_includes)) \

    $(eval LOCAL_SRC_FILES := $(file)) \

    $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \

    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \

    $(eval include $(BUILD_EXECUTABLE)) \

    $(eval include $(BUILD_NATIVE_TEST)) \

)



# Build the manual test programs.

libs/androidfw/tests/InputEvent_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <binder/Parcel.h>



#include <math.h>

#include <SkMatrix.h>

#include <core/SkMatrix.h>



namespace android {