build/android/setup.gyp - Issue 706203003: Update from https://crrev.com/303153

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/setup.gyp

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: 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:

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 | « build/android/pylib/utils/device_temp_file_test.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »