From 0e20b4e64a974846888b61c012c5fe2b42c24b78 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Fri, 18 Nov 2016 17:57:27 -0800
Subject: snap: Fix build

Change-Id: I58bd086164769669cf08810fc3f7ac1cdc7ec374
---
 Android.mk       | 6 +-----
 tests/Android.mk | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index e38155ffd..bfc0dd91e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,8 +50,4 @@ endif
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH)/jni)
-
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call all-makefiles-under,$(LOCAL_PATH)/tests)
-endif
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/tests/Android.mk b/tests/Android.mk
index 920f8f0ff..1d17623d2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,3 +1,5 @@
+ifeq (,$(ONE_SHOT_MAKEFILE))
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -16,3 +18,5 @@ LOCAL_PACKAGE_NAME := SnapTests
 LOCAL_INSTRUMENTATION_FOR := Snap
 
 include $(BUILD_PACKAGE)
+
+endif
-- 
cgit v1.2.3