summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2015-05-21 14:53:23 +0100
committerPaul Duffin <paulduffin@google.com>2015-05-21 14:53:23 +0100
commitf5d1aa126d3f5fbfd46a130305e77cc649a72c25 (patch)
tree18cbb581a838937bfb756292bfcc2bb5d0576cef
parent55882370101a14df8d1c269e84b10a658cd72fca (diff)
downloadandroid_frameworks_ex-f5d1aa126d3f5fbfd46a130305e77cc649a72c25.tar.gz
android_frameworks_ex-f5d1aa126d3f5fbfd46a130305e77cc649a72c25.tar.bz2
android_frameworks_ex-f5d1aa126d3f5fbfd46a130305e77cc649a72c25.zip
Include the frameworks/ex/variablespeed/tests/Android.mk file
The makefile was not included, either from the AOSP root makefile or from the makefile at the root of this tree. This change fixes that. Change-Id: I1acf663ca19a459e6c67f2d8354f9b5310f54ec0
-rw-r--r--variablespeed/Android.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/variablespeed/Android.mk b/variablespeed/Android.mk
index d5acbe0..32758a8 100644
--- a/variablespeed/Android.mk
+++ b/variablespeed/Android.mk
@@ -33,8 +33,5 @@ LOCAL_SRC_FILES := \
include $(BUILD_STATIC_JAVA_LIBRARY)
-# Build the native code, library.
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/jni/Android.mk
+# Build the native code library and tests.
+include $(call all-makefiles-under, $(LOCAL_PATH))