diff options
| author | John Reck <jreck@google.com> | 2014-05-20 14:10:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 14:10:53 +0000 |
| commit | 1fcc3b18969815ab1a386823fa246f483465dd04 (patch) | |
| tree | 2177410863f971e03c7f273124eec3798a9387e7 /tests | |
| parent | 2566bc82cc7c348759e39632c6f88e4f7af10e1b (diff) | |
| parent | 918988c1ce5af002d41c7ac37f3fa490558b0c90 (diff) | |
| download | frameworks_base-1fcc3b18969815ab1a386823fa246f483465dd04.zip frameworks_base-1fcc3b18969815ab1a386823fa246f483465dd04.tar.gz frameworks_base-1fcc3b18969815ab1a386823fa246f483465dd04.tar.bz2 | |
Merge "Baby steps"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RenderThreadTest/Android.mk | 2 | ||||
| -rw-r--r-- | tests/RenderThreadTest/AndroidManifest.xml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/RenderThreadTest/Android.mk b/tests/RenderThreadTest/Android.mk index bdcba2e..e07e943 100644 --- a/tests/RenderThreadTest/Android.mk +++ b/tests/RenderThreadTest/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := tests # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/RenderThreadTest/AndroidManifest.xml b/tests/RenderThreadTest/AndroidManifest.xml index c76cfce..a7f4f6e 100644 --- a/tests/RenderThreadTest/AndroidManifest.xml +++ b/tests/RenderThreadTest/AndroidManifest.xml @@ -4,10 +4,6 @@ android:versionCode="1" android:versionName="1.0" > - <uses-sdk - android:minSdkVersion="18" - android:targetSdkVersion="18" /> - <application android:allowBackup="true" android:icon="@drawable/ic_launcher" |