diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-05-22 17:31:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-22 17:31:43 +0000 |
| commit | 56f9fe09254082b67cc40e38555f3bbd66a893bb (patch) | |
| tree | 688c248822d0144d9ad7e1fc52a5b936728b0fa4 | |
| parent | 49640ea5d631a3acc67b248889e7a7da187d4a07 (diff) | |
| parent | b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6 (diff) | |
| download | android_frameworks_ex-56f9fe09254082b67cc40e38555f3bbd66a893bb.tar.gz android_frameworks_ex-56f9fe09254082b67cc40e38555f3bbd66a893bb.tar.bz2 android_frameworks_ex-56f9fe09254082b67cc40e38555f3bbd66a893bb.zip | |
am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"
* commit 'b8ba8dbc906eda2d5ae35846d50bc9414a6ac7d6':
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)) |