Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index 3babd09f684e8db95feca85ba80707922932fc4f..771102c0d38d0bf73c2b5bed4592022f53ffd3c0 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -126,6 +126,11 @@ |
'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'], |
}, |
}], |
+ ['native_libs_paths != [] and component == "shared_library"', { |
+ 'dependencies': [ |
+ '<(DEPTH)/build/android/setup.gyp:copy_system_libraries', |
+ ] |
+ }], |
['native_libs_paths != []', { |
'variables': { |
'compile_input_paths': [ '<(native_libraries_java_stamp)' ], |
@@ -146,6 +151,8 @@ |
'action': [ |
'python', '<(DEPTH)/build/android/write_ordered_libraries.py', |
'--input-libraries=<(native_libs_paths)', |
+ # TODO(cjhopman): Do we need to use readelf from the android toolchain? |
Yaron
2013/04/02 01:30:35
Let's. android_toolchain should give you what you
cjhopman
2013/04/02 20:47:31
Done.
|
+ '--readelf=readelf', |
'--output=<(ordered_libraries_file)', |
], |
}, |