diff options
| author | Cary Clark <> | 2009-04-06 09:55:02 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-06 09:55:02 -0700 |
| commit | d7c7a8a52ed8411da25f0a50ae4abe2aace9e147 (patch) | |
| tree | 547bf4dc13a64a8d5008ce87a532cf82c4b34e32 /JavaScriptCore | |
| parent | a30717b6ace2324075e3cd8ae43e535811793a7a (diff) | |
| download | external_webkit-d7c7a8a52ed8411da25f0a50ae4abe2aace9e147.zip external_webkit-d7c7a8a52ed8411da25f0a50ae4abe2aace9e147.tar.gz external_webkit-d7c7a8a52ed8411da25f0a50ae4abe2aace9e147.tar.bz2 | |
AI 144643: a few more fixes for the automated merge tool
don't include chromium files in JavaScriptCore
add a list of generated files to exclude
BUG=1553405
Automated import of CL 144643
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 23b2980..b04ebaf 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -39,6 +39,7 @@ # If an entry starts with '^', the first directory must match # LOCAL_DIR_WILDCARD_EXCLUDED := \ # ^API/* \ +# /chromium/* \ # /gtk/* \ # ^jit/* \ # /mac/* \ |