summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2013-04-15 01:30:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-15 01:30:32 +0000
commit1821b0a4eb7a78d2744801b1f863455fd384e283 (patch)
tree4d055b60d0d46bbbf54fcec1cf0144bc23de8fc5 /camera
parent6efa0c06acb4bdcf9c1fb1dbb4beee254e040848 (diff)
parentb34e0b72f013794acec4304ec3dec8da8dba81a6 (diff)
downloadframeworks_av-1821b0a4eb7a78d2744801b1f863455fd384e283.zip
frameworks_av-1821b0a4eb7a78d2744801b1f863455fd384e283.tar.gz
frameworks_av-1821b0a4eb7a78d2744801b1f863455fd384e283.tar.bz2
Merge "Update the test output path." into jb-mr2-dev
Diffstat (limited to 'camera')
-rw-r--r--camera/tests/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/tests/Android.mk b/camera/tests/Android.mk
index e455943..ec13911 100644
--- a/camera/tests/Android.mk
+++ b/camera/tests/Android.mk
@@ -35,4 +35,4 @@ LOCAL_CFLAGS += -Wall -Wextra
LOCAL_MODULE:= camera_client_test
LOCAL_MODULE_TAGS := tests
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)