Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2835)

Unified Diff: build/android/setup.gyp

Issue 695333003: Use thumb versions of external libraries with ARMv7. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/setup.gyp
diff --git a/build/android/setup.gyp b/build/android/setup.gyp
index 7dce19de7266a0dcde4740bc4ec33e2d3848e7fe..f10ab3e861f3e2a33a35675dd5a11f3669c27e3d 100644
--- a/build/android/setup.gyp
+++ b/build/android/setup.gyp
@@ -12,13 +12,26 @@
# <(SHARED_LIB_DIR)
'target_name': 'copy_system_libraries',
'type': 'none',
- 'copies': [
- {
- 'destination': '<(SHARED_LIB_DIR)/',
- 'files': [
- '<(android_stlport_libs_dir)/libstlport_shared.so',
+ 'conditions': [
+ ['target_arch=="arm" and arm_thumb==1', {
+ 'copies': [
+ {
+ 'destination': '<(SHARED_LIB_DIR)/',
+ 'files': [
+ '<(android_stlport_libs_dir)/thumb/libstlport_shared.so',
+ ],
+ },
],
- },
+ }, {
+ 'copies': [
+ {
+ 'destination': '<(SHARED_LIB_DIR)/',
+ 'files': [
+ '<(android_stlport_libs_dir)/libstlport_shared.so',
+ ],
+ },
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698