diff options
| author | Cary Clark <> | 2009-03-30 11:02:39 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-30 11:02:39 -0700 |
| commit | ca36d3b9deeb5be2d9abb6255c1849ec37e2f108 (patch) | |
| tree | 896dcb1dba7bb7f83d6ba58088785889f109230f /JavaScriptCore | |
| parent | fb34b333c6e0808e888c8d327875e5369a3809d3 (diff) | |
| download | external_webkit-ca36d3b9deeb5be2d9abb6255c1849ec37e2f108.zip external_webkit-ca36d3b9deeb5be2d9abb6255c1849ec37e2f108.tar.gz external_webkit-ca36d3b9deeb5be2d9abb6255c1849ec37e2f108.tar.bz2 | |
AI 143486: Update diff tool rules in webkit makefiles.
Anticipating another merge with webkit, these changes
update the rules to automatically exclude files we've already removed
manually. A new rule allows including files that are not yet
checked into webkit's makefiles (e.g., Touch).
The exclude rules no longer need to be alphabetized, but the
makefile sources still do -- so fix a couple of entries that
are out of order.
BUG=1553405
Automated import of CL 143486
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 3f31272..23b2980 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -19,7 +19,6 @@ # This comment block is read by tools/webkitsync/diff.cpp # Don't remove it or move it. -# If you edit it, keep it in alphabetical order # # The following files are intentionally not included # LOCAL_SRC_FILES_EXCLUDED := \ @@ -34,7 +33,6 @@ # This comment block is read by tools/webkitsync/diff.cpp # Don't remove it or move it. -# If you edit it, keep it in alphabetical order # # The following directory wildcard matches are intentionally not included # If an entry starts with '/', any subdirectory may match @@ -165,7 +163,6 @@ LOCAL_SRC_FILES := \ wtf/Assertions.cpp \ wtf/ByteArray.cpp \ wtf/CurrentTime.cpp \ - wtf/dtoa.cpp \ wtf/FastMalloc.cpp \ wtf/HashTable.cpp \ wtf/MainThread.cpp \ @@ -177,8 +174,11 @@ LOCAL_SRC_FILES := \ \ wtf/android/MainThreadAndroid.cpp \ \ + wtf/dtoa.cpp \ + \ wtf/unicode/CollatorDefault.cpp \ wtf/unicode/UTF8.cpp \ + \ wtf/unicode/icu/CollatorICU.cpp # Rule to build grammar.y with our custom bison. |