am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread

Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
This commit is contained in:
Brett Chabot
2010-08-10 10:30:32 -07:00
committed by Android Git Automerger

View File

@@ -11,11 +11,9 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, DisabledTestApp/src) \ $(call all-java-files-under, DisabledTestApp/src) \
$(call all-java-files-under, EnabledTestApp/src) $(call all-java-files-under, EnabledTestApp/src)
LOCAL_STATIC_JAVA_LIBRARIES += android-common
LOCAL_DX_FLAGS := --core-library LOCAL_DX_FLAGS := --core-library
LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib LOCAL_STATIC_JAVA_LIBRARIES := core-tests-supportlib android-common
LOCAL_JAVA_LIBRARIES := android.test.runner android-common LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_PACKAGE_NAME := FrameworksCoreTests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform