OSDN Git Service
(root)
/
android-x86
/
packages-apps-Browser.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge change I7cb3951e into eclair
[android-x86/packages-apps-Browser.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
02ba333
..
33cd6ab
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-3,10
+3,6
@@
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := user
LOCAL_MODULE_TAGS := user
-# TODO: Remove dependency of application on the test runner (android.test.runner)
-# library.
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
LOCAL_STATIC_JAVA_LIBRARIES := google-framework
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := google-framework
LOCAL_SRC_FILES := $(call all-subdir-java-files)
@@
-14,3
+10,6
@@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := Browser
include $(BUILD_PACKAGE)
LOCAL_PACKAGE_NAME := Browser
include $(BUILD_PACKAGE)
+
+# additionally, build tests in sub-folders in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))