commit e441c87106a8c6b51a1eefcb5df9ba99002a3d69
author David Rim <davidrim@google.com> Fri Jun 01 15:55:11 2018 +0900
committer Mika Raento <mikie@google.com> Tue Jun 05 14:22:39 2018 +0100
tree 0f6f961866acd4f9825b1c6823777f29b32c0a17
parent cfb4af089723ec49bce6148970f675b4629ea125

Run test with Parameterized to load additional models

Changes test to run using TestModelEntry as a test parameter
allowing models to be loaded and run without changing the test class.
Also allow Google test models to be run if vendor/google/tests/mlts/models/assets
is available.

Bug: 74583984
Test: adb shell am instrument -w \
      com.example.android.nn.benchmark/android.support.test.runner.AndroidJUnitRunner

Change-Id: I7a88aeb1869b197eecc22f655f170e09a0526bd4
Merged-In: I7a88aeb1869b197eecc22f655f170e09a0526bd4
(cherry picked from commit a84cb52f43166a48629351ce2e3ed6ecf06d22b6)

Android.mk

diff --git a/Android.mk b/Android.mk
index d0e9076..8c6b7e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,4 +31,9 @@
 LOCAL_SDK_VERSION := 27
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/../models/assets
 
+GOOGLE_TEST_MODELS_DIR := vendor/google/tests/mlts/models/assets
+ifneq ($(wildcard $(GOOGLE_TEST_MODELS_DIR)),)
+LOCAL_ASSET_DIR += $(GOOGLE_TEST_MODELS_DIR)
+endif
+
 include $(BUILD_PACKAGE)