Updated dhrystone to use the new resource resoultion mechanics.

wa/workloads/dhrystone/__init__.py

@@ -18,10 +18,7 @@
 import os
 import re
 
-from wa import Workload, Parameter, ConfigError
+from wa import Workload, Parameter, ConfigError, Executable
-
-
-this_dir = os.path.dirname(__file__)
 
 
 class Dhrystone(Workload):
@@ -75,7 +72,8 @@ class Dhrystone(Workload):
     ]
 
     def initialize(self, context):
-        host_exe = os.path.join(this_dir, 'dhrystone')
+        resource = Executable(self, self.target.abi, 'dhrystone')
+        host_exe = context.resolver.get(resource)
         Dhrystone.target_exe = self.target.install(host_exe)
 
     def setup(self, context):

wa/workloads/dhrystone/src/Makefile

@@ -13,11 +13,5 @@
 # limitations under the License.
 #
 
-
+dhrystone: dhrystone.c
-ndk-build
+	$(CROSS_COMPILE)gcc -O3 -static dhrystone.c -o dhrystone
-if [[ -f libs/armeabi/dhrystone ]]; then
-	echo "Dhrystone binary updated."
-	cp libs/armeabi/dhrystone ..
-	rm -rf libs
-	rm -rf obj
-fi

wa/workloads/dhrystone/src/jni/Android.mk

@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= dhrystone.c 
-LOCAL_MODULE := dhrystone
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_LIBRARIES := libc
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_LDLIBS := -llog
-LOCAL_CFLAGS := -O2
-include $(BUILD_EXECUTABLE)