Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index ff837c38e71ec8f75fcf3ab7bcc08de79023ea35..ae228379e5c02865a8936bc45ad276ff26698f85 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -102,9 +102,7 @@ |
'package_input_paths': [], |
'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json', |
'additional_ordered_libraries_file': '<(intermediate_dir)/additional_native_libraries.json', |
- 'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template', |
'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/', |
- 'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java', |
'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp', |
'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/', |
'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h', |
@@ -165,6 +163,13 @@ |
'unsigned_abi_split_apk_path': '<(unsigned_abi_split_apk_path)', |
'create_abi_split%': '<(create_abi_split)', |
'conditions': [ |
+ ['is_test_apk == 1', { |
+ 'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeTestLibraries.template', |
+ 'native_libraries_java_file_name': 'NativeTestLibraries.java', |
+ }, { |
+ 'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template', |
+ 'native_libraries_java_file_name': 'NativeLibraries.java', |
+ }], |
['gyp_managed_install == 1 and native_lib_target != ""', { |
'conditions': [ |
['create_abi_split == 0', { |
@@ -197,6 +202,8 @@ |
}, |
'native_lib_target%': '', |
'native_lib_version_name%': '', |
+ 'native_libraries_template': '<(native_libraries_template)', |
+ 'native_libraries_java_file': '<(native_libraries_java_dir)/<(native_libraries_java_file_name)', |
'use_chromium_linker%' : 0, |
'load_library_from_zip%' : 0, |
'use_relocation_packer%' : 0, |
@@ -363,7 +370,7 @@ |
], |
'action': [ |
'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py', |
- '--include-path=', |
+ '--include-path=<(DEPTH)', |
'--output=<(native_libraries_java_file)', |
'--template=<(native_libraries_template)', |
'--stamp=<(native_libraries_java_stamp)', |