X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=6e20ab80423be9a8abf264b493e2021566eb8406;hb=f56f68d291ae26ff25db4dc62122692c1dd1f4f9;hp=f8cfafec704ad378694107b7ec91600abd3b9f5e;hpb=ba6d7b853c32ad6c3be26c443daa61f322bcfdc2;p=android-x86%2Fpackages-apps-Browser.git

diff --git a/Android.mk b/Android.mk
index f8cfafe..6e20ab8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,17 +1,18 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := user development
+LOCAL_MODULE_TAGS := optional
 
-# TODO: Remove dependency of application on the test runner (android.test.runner) 
-# library.
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := \
+        android-common
 
-LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files) \
-	src/com/android/browser/IGearsDialogService.aidl
+LOCAL_SRC_FILES := \
+        $(call all-java-files-under, src) \
+        src/com/android/browser/EventLogTags.logtags
 
 LOCAL_PACKAGE_NAME := Browser
 
 include $(BUILD_PACKAGE)
+
+# additionally, build tests in sub-folders in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))