Chromium Code Reviews| Index: build/java_apk.gypi |
| diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
| index 52bd37296a12ba6b769921ddae1f9487b8d5e2b5..86c9f165092ace393d939543035d798d11d345cd 100644 |
| --- a/build/java_apk.gypi |
| +++ b/build/java_apk.gypi |
| @@ -240,6 +240,7 @@ |
| }, |
| 'dependencies': [ |
| '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum', |
| + '<(DEPTH)/build/android/setup.gyp:get_build_device_configurations', |
| ], |
| 'actions': [ |
| { |
| @@ -253,12 +254,14 @@ |
| '<(DEPTH)/build/android/gyp/create_device_library_links.py', |
| '<(apk_install_record)', |
| '<(ordered_libraries_file)', |
| + '<(build_device_config_path)', |
|
shashi
2013/06/20 03:16:19
sorted inputs.
cjhopman
2013/06/25 16:43:11
Done.
|
| ], |
| 'outputs': [ |
| '<(link_stamp)' |
| ], |
| 'action': [ |
| 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py', |
| + '--build-device-configuration=<(build_device_config_path)', |
| '--libraries-json=<(ordered_libraries_file)', |
| '--script-host-path=<(symlink_script_host_path)', |
| '--script-device-path=<(symlink_script_device_path)', |
| @@ -347,21 +350,18 @@ |
| 'inputs': [ |
| '<(DEPTH)/build/android/gyp/util/build_utils.py', |
| '<(DEPTH)/build/android/gyp/apk_install.py', |
| + '<(build_device_config_path)', |
| '<(incomplete_apk_path)', |
| ], |
| 'outputs': [ |
| '<(apk_install_record)', |
| - # If a user switches the connected device, the APK may need to be |
| - # installed even if there have been no changes. To ensure that the |
| - # APK on the device is always up-to-date, this step should always |
| - # be triggered. |
| - '<(apk_install_record).fake', |
| ], |
| 'action': [ |
| 'python', '<(DEPTH)/build/android/gyp/apk_install.py', |
| '--android-sdk-tools=<(android_sdk_tools)', |
| '--apk-path=<(incomplete_apk_path)', |
| - '--install-record=<(apk_install_record)' |
| + '--install-record=<(apk_install_record)', |
| + '--build-device-configuration=<(build_device_config_path)', |
|
shashi
2013/06/20 03:16:19
sorted?
cjhopman
2013/06/25 16:43:11
Done.
|
| ], |
| }, |
| ], |