summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@android.com>2010-08-09 18:49:54 -0700
committerBrett Chabot <brettchabot@android.com>2010-08-09 18:49:54 -0700
commit56718cb1cb2775f8705f37f917fbcd013dc259a3 (patch)
tree3f38f86e531d4aaa554f8b525bd4f1cfa3612615
parent745d1e905886ed0d8fa0a8590463093d125bc53a (diff)
downloadframeworks_base-56718cb1cb2775f8705f37f917fbcd013dc259a3.zip
frameworks_base-56718cb1cb2775f8705f37f917fbcd013dc259a3.tar.gz
frameworks_base-56718cb1cb2775f8705f37f917fbcd013dc259a3.tar.bz2
Fix gingerbread FrameworkCoreTests makefile.
android-common should be included as a static library. Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
-rw-r--r--core/tests/coretests/Android.mk6
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