Index: build/android/setup.gyp |
diff --git a/build/build_output_dirs_android.gyp b/build/android/setup.gyp |
similarity index 63% |
rename from build/build_output_dirs_android.gyp |
rename to build/android/setup.gyp |
index cc35e6d871c03af9743c7a8aea6e061712c80b5c..07034e326a19c18dfea2366c1502b5b4dff3adce 100644 |
--- a/build/build_output_dirs_android.gyp |
+++ b/build/android/setup.gyp |
@@ -4,6 +4,23 @@ |
{ |
'targets': [ |
{ |
+ # These libraries from the Android ndk are required to be packaged with |
Yaron
2013/04/02 01:30:35
This is only true for the component build and so y
cjhopman
2013/04/02 20:47:31
Done.
|
+ # any APK that is built with them. build/java_apk.gypi expects any |
+ # libraries that should be packaged with the apk to be in |
+ # <(SHARED_LIB_DIR) |
+ 'target_name': 'copy_system_libraries', |
+ 'type': 'none', |
+ 'copies': [ |
+ { |
+ 'destination': '<(SHARED_LIB_DIR)/', |
+ 'files': [ |
+ '<(DEPTH)/third_party/android_tools/ndk/sources/cxx-stl/stlport/libs/<(android_app_abi)/libstlport_shared.so', |
Yaron
2013/04/02 01:30:35
Can you not use <(android_ndk_root) ?
Yaron
2013/04/02 01:30:35
Can you add a comment to build/common.gypi where t
cjhopman
2013/04/02 20:47:31
Done.
cjhopman
2013/04/02 20:47:31
I've refactored common.gypi so that any changes to
Yaron
2013/04/02 21:00:41
Nice
|
+ '<(DEPTH)/third_party/android_tools/ndk/sources/cxx-stl/gnu-libstdc++/4.6/libs/<(android_app_abi)/libgnustl_shared.so', |
+ ], |
+ }, |
+ ], |
+ }, |
+ { |
# Target for creating common output build directories. Creating output |
# dirs beforehand ensures that build scripts can assume these folders to |
# exist and there are no race conditions resulting from build scripts |
@@ -34,5 +51,6 @@ |
}, |
], |
}, # build_output_dirs |
- ], # targets |
+ ] |
} |
+ |