diff options
| author | Sriram Raman <sriramkraman@google.com> | 2009-06-23 01:24:04 -0700 |
|---|---|---|
| committer | Sriram Raman <sriramkraman@google.com> | 2009-06-23 01:24:04 -0700 |
| commit | 161cad0400606c21cfac9b92357d5a25d2ad84bb (patch) | |
| tree | e22e2255fbb32ddcf09e70ad84990a8278baa5e8 /perf | |
| parent | 616ad0c2b4a8561fcf943605dd2b64725bc41145 (diff) | |
| parent | d768f1ca00f12b3fe6d0b90a47fb00f1f8decd83 (diff) | |
| download | external_webkit-161cad0400606c21cfac9b92357d5a25d2ad84bb.zip external_webkit-161cad0400606c21cfac9b92357d5a25d2ad84bb.tar.gz external_webkit-161cad0400606c21cfac9b92357d5a25d2ad84bb.tar.bz2 | |
Merge commit 'd768f1ca' into manualmerge
Conflicts:
perf/Android.mk
Diffstat (limited to 'perf')
| -rw-r--r-- | perf/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perf/Android.mk b/perf/Android.mk index ce84e37..80ed7df 100644 --- a/perf/Android.mk +++ b/perf/Android.mk @@ -47,6 +47,6 @@ LOCAL_MODULE := webcore_test # before we try to compile our sources. LOCAL_ADDITIONAL_DEPENDENCIES := $(filter %.h, $(WEBKIT_GENERATED_SOURCES)) -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) |