| Index: platform_tools/android/gyp/dependencies.gypi
|
| diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
|
| index eb34f10cd7f730e52d8b52ab17f013de2c5454c1..49937b0f68893dd2bd768ec09ac9f2ef5a1e8d68 100644
|
| --- a/platform_tools/android/gyp/dependencies.gypi
|
| +++ b/platform_tools/android/gyp/dependencies.gypi
|
| @@ -33,7 +33,7 @@
|
| 'cflags': [
|
| '-w',
|
| ],
|
| - },
|
| + },
|
| {
|
| 'target_name': 'cpu_features',
|
| 'type': 'static_library',
|
| @@ -64,31 +64,6 @@
|
| },
|
| },
|
| {
|
| - 'target_name': 'expat',
|
| - 'type': 'static_library',
|
| - 'sources': [
|
| - '../third_party/externals/expat/lib/xmlparse.c',
|
| - '../third_party/externals/expat/lib/xmlrole.c',
|
| - '../third_party/externals/expat/lib/xmltok.c',
|
| - ],
|
| - 'include_dirs': [
|
| - '../third_party/externals/expat',
|
| - '../third_party/externals/expat/lib',
|
| - ],
|
| - 'cflags': [
|
| - '-w',
|
| - '-fexceptions',
|
| - ],
|
| - 'defines': [
|
| - 'HAVE_EXPAT_CONFIG_H',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'include_dirs': [
|
| - '../third_party/externals/expat/lib', # For expat.h
|
| - ],
|
| - }
|
| - },
|
| - {
|
| # This target is a dependency for all console-type Skia applications which
|
| # will run on Android. Since Android requires us to load native code in
|
| # shared libraries, we need a common entry point to wrap around main().
|
|
|