diff options
| author | 2010-08-10 10:30:32 -0700 | |
|---|---|---|
| committer | 2010-08-10 10:30:32 -0700 | |
| commit | 4f94181282e7f23d19a5fcab5f1b93d6d52e7715 (patch) | |
| tree | 2cdf3b865d9de7baf620cf94c9d5ad1aacfc9791 | |
| parent | f13542f2eba27d9b09ba6aa313f758e5518caa00 (diff) | |
| parent | e967ee49b5a86de2be11dd1d28283c337b01e537 (diff) | |
am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp
* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
Fix gingerbread FrameworkCoreTests makefile.
| -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 01faaadf0f86..693ef188fc95 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 |