diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-08-10 10:27:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 10:27:48 -0700 |
| commit | e967ee49b5a86de2be11dd1d28283c337b01e537 (patch) | |
| tree | de408e74f5fc94d2c2f1dc0e14acb168519fa0da | |
| parent | 259b4c860212dd528b25d1cce6e74be01afed85c (diff) | |
| parent | 56718cb1cb2775f8705f37f917fbcd013dc259a3 (diff) | |
| download | frameworks_base-e967ee49b5a86de2be11dd1d28283c337b01e537.zip frameworks_base-e967ee49b5a86de2be11dd1d28283c337b01e537.tar.gz frameworks_base-e967ee49b5a86de2be11dd1d28283c337b01e537.tar.bz2 | |
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
| -rw-r--r-- | core/tests/coretests/Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 01faaad..693ef18 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -11,11 +11,9 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, DisabledTestApp/src) \ $(call all-java-files-under, EnabledTestApp/src) -LOCAL_STATIC_JAVA_LIBRARIES += android-common - LOCAL_DX_FLAGS := --core-library -LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib -LOCAL_JAVA_LIBRARIES := android.test.runner android-common +LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib android-common +LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_CERTIFICATE := platform |