diff options
author | 2010-04-16 16:56:19 +0200 | |
---|---|---|
committer | 2010-04-16 16:56:19 +0200 | |
commit | acae9e5d8d17176206daee3cd5021237b1acc7f6 (patch) | |
tree | 15c1aef4271d57af25998c9b501b40eceaf7c428 /recipes/chromium/chromium | |
parent | 37d07630e7505c9f81a85bbeb08b31e0acb83416 (diff) | |
download | openembedded-acae9e5d8d17176206daee3cd5021237b1acc7f6.tar.gz |
chromium: import updates from AI repo
* The workaround for depot-tools is gross, but I lack the time to fix this
Diffstat (limited to 'recipes/chromium/chromium')
-rw-r--r-- | recipes/chromium/chromium/armv7a/include.gypi | 25 | ||||
-rw-r--r-- | recipes/chromium/chromium/gypi.patch | 19 |
2 files changed, 44 insertions, 0 deletions
diff --git a/recipes/chromium/chromium/armv7a/include.gypi b/recipes/chromium/chromium/armv7a/include.gypi new file mode 100644 index 0000000000..1a4580bff6 --- /dev/null +++ b/recipes/chromium/chromium/armv7a/include.gypi @@ -0,0 +1,25 @@ +{ + 'variables': { + + # Configure for armv7 compilation + 'target_arch': 'arm', + 'armv7': 1, + + # Disable native client (Google's settings) + 'disable_nacl': 1, + + # V8 config (Google's settings) + 'v8_use_snapshot': 'false', + + # No ffmpeg binaries in the tree, so make sure the build will not fail + 'use_system_ffmpeg' : '1', + + # Needed for ARM compilation (build fails otherwise) + 'linux_use_tcmalloc': 0, + + # Change to your rootfs path + 'sysroot': '__PATH__TO_BE_REPLACED__', + + #'arm_thumb': 1, + } +}
\ No newline at end of file diff --git a/recipes/chromium/chromium/gypi.patch b/recipes/chromium/chromium/gypi.patch new file mode 100644 index 0000000000..cd5542f836 --- /dev/null +++ b/recipes/chromium/chromium/gypi.patch @@ -0,0 +1,19 @@ +--- a/tools/gyp/pylib/gyp/__init__.py 2009-12-10 22:36:18.000000000 +0800 ++++ b/tools/gyp/pylib/gyp/__init__.py 2009-12-10 22:39:23.000000000 +0800 +@@ -376,10 +376,12 @@ + + # If ~/.gyp/include.gypi exists, it'll be forcibly included into every + # .gyp file that's loaded, before anything else is included. +- if home_dot_gyp != None: +- default_include = os.path.join(home_dot_gyp, 'include.gypi') +- if os.path.exists(default_include): +- includes.append(default_include) ++ #if home_dot_gyp != None: ++ # default_include = os.path.join(home_dot_gyp, 'include.gypi') ++ # if os.path.exists(default_include): ++ # includes.append(default_include) ++ ++ includes.append(__PATH__TO_BE_REPLACED__) + + # Command-line --include files come after the default include. + if options.includes: |