diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 06:19:34 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 06:19:34 +0000 |
| commit | 13f0e936d91183a4007335e4031df12d0580fd66 (patch) | |
| tree | 88dc40df9c1e81158afb71d6e1dc9061ae592614 /build | |
| parent | f08f39b9cbca69486dc29cba562b664747f90685 (diff) | |
| download | chromium_src-13f0e936d91183a4007335e4031df12d0580fd66.zip chromium_src-13f0e936d91183a4007335e4031df12d0580fd66.tar.gz chromium_src-13f0e936d91183a4007335e4031df12d0580fd66.tar.bz2 | |
Revert r169382 now that android:40302 is fixed.
Thin archives are once again ok for android static_library builds.
(related, the webrtc build no longer uses the ndk-build system)
BUG=https://code.google.com/p/webrtc/issues/detail?id=950
Review URL: https://codereview.chromium.org/118873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index e92c231..70f22d5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3913,14 +3913,6 @@ }], ], }], - # ndk-build copies .a's around the filesystem, breaking - # relative paths in thin archives. Disable using thin - # archives to avoid problems until one of these is fixed: - # http://code.google.com/p/android/issues/detail?id=40302 - # http://code.google.com/p/android/issues/detail?id=40303 - ['_type=="static_library"', { - 'standalone_static_library': 1, - }], ], }], # Settings for building host targets using the system toolchain. |