diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-05-22 13:57:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-22 13:57:48 +0000 |
| commit | b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6 (patch) | |
| tree | 18cbb581a838937bfb756292bfcc2bb5d0576cef | |
| parent | 55882370101a14df8d1c269e84b10a658cd72fca (diff) | |
| parent | f5d1aa126d3f5fbfd46a130305e77cc649a72c25 (diff) | |
| download | android_frameworks_ex-b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6.tar.gz android_frameworks_ex-b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6.tar.bz2 android_frameworks_ex-b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6.zip | |
Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"
| -rw-r--r-- | variablespeed/Android.mk | 7 |
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)) |