| Index: build/java_apk.gypi
|
| diff --git a/build/java_apk.gypi b/build/java_apk.gypi
|
| index 666c2831affd464a812b254df680ad9e3adc3d47..f1efacce939cdf06835bb69ce55c4d0b74e5713a 100644
|
| --- a/build/java_apk.gypi
|
| +++ b/build/java_apk.gypi
|
| @@ -141,7 +141,7 @@
|
| 'action_name': 'ordered_libraries_<(_target_name)',
|
| 'message': 'Writing dependency ordered libraries for <(_target_name).',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/write_ordered_libraries.py',
|
| '<@(native_libs_paths)',
|
| ],
|
| @@ -159,15 +159,15 @@
|
| 'action_name': 'native_libraries_template_data_<(_target_name)',
|
| 'message': 'Creating native_libraries_list.h for <(_target_name).',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| - '<(DEPTH)/build/android/create_native_libraries_header.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
|
| '<(ordered_libraries_file)',
|
| ],
|
| 'outputs': [
|
| '<(native_libraries_template_data_stamp)',
|
| ],
|
| 'action': [
|
| - 'python', '<(DEPTH)/build/android/create_native_libraries_header.py',
|
| + 'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
|
| '--ordered-libraries=<(ordered_libraries_file)',
|
| '--output=<(native_libraries_template_data_file)',
|
| '--stamp=<(native_libraries_template_data_stamp)',
|
| @@ -177,8 +177,8 @@
|
| 'action_name': 'native_libraries_<(_target_name)',
|
| 'message': 'Creating NativeLibraries.java for <(_target_name).',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| - '<(DEPTH)/build/android/gcc_preprocess.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
|
| '<(native_libraries_template_data_stamp)',
|
| '<(native_libraries_template)',
|
| ],
|
| @@ -186,7 +186,7 @@
|
| '<(native_libraries_java_stamp)',
|
| ],
|
| 'action': [
|
| - 'python', '<(DEPTH)/build/android/gcc_preprocess.py',
|
| + 'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
|
| '--include-path=<(native_libraries_template_data_dir)',
|
| '--output=<(native_libraries_java_file)',
|
| '--template=<(native_libraries_template)',
|
| @@ -197,15 +197,15 @@
|
| 'action_name': 'strip_native_libraries',
|
| 'message': 'Stripping libraries for <(_target_name)',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| - '<(DEPTH)/build/android/strip_library_for_apk.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/strip_library_for_apk.py',
|
| '<(ordered_libraries_file)'
|
| ],
|
| 'outputs': [
|
| '<(strip_stamp)',
|
| ],
|
| 'action': [
|
| - 'python', '<(DEPTH)/build/android/strip_library_for_apk.py',
|
| + 'python', '<(DEPTH)/build/android/gyp/strip_library_for_apk.py',
|
| '--android-strip=<(android_strip)',
|
| '--android-strip-arg=--strip-unneeded',
|
| '--stripped-libraries-dir=<(apk_libraries_dir)',
|
| @@ -229,7 +229,7 @@
|
| 'action_name': 'push_libraries_<(_target_name)',
|
| 'message': 'Pushing libraries to device for <(_target_name)',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/util/md5_check.py',
|
| '<(DEPTH)/build/android/gyp/push_libraries.py',
|
| '<(strip_stamp)',
|
| @@ -302,7 +302,7 @@
|
| 'action_name': 'apk_install_<(_target_name)',
|
| 'message': 'Installing <(apk_name).apk',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/apk_install.py',
|
| '<(final_apk_path)',
|
| ],
|
| @@ -377,7 +377,7 @@
|
| ],
|
| },
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/javac.py',
|
| # If there is a separate find for additional_src_dirs, it will find the
|
| # wrong .java files when additional_src_dirs is empty.
|
| @@ -406,7 +406,7 @@
|
| 'action_name': 'jar_<(_target_name)',
|
| 'message': 'Creating <(_target_name) jar',
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/util/md5_check.py',
|
| '<(DEPTH)/build/android/gyp/jar.py',
|
| '<(compile_stamp)',
|
| @@ -486,7 +486,7 @@
|
| ],
|
| },
|
| 'inputs': [
|
| - '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| '<(DEPTH)/build/android/gyp/util/md5_check.py',
|
| '<(DEPTH)/build/android/gyp/dex.py',
|
| '<(compile_stamp)',
|
|
|