diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-07-01 14:26:10 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-07-01 14:26:10 +0100 |
commit | 2f22f038970e0d1927c41b04bbf5589bd12c5316 (patch) | |
tree | 15ae69a6496c31f7a00fed54dd22af04dcc8fb81 /android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk | |
parent | 770300fb3fec927eb702b146c92281093e917c72 (diff) | |
download | chromium_org-2f22f038970e0d1927c41b04bbf5589bd12c5316.tar.gz |
Merge from Chromium at DEPS revision 37.0.2062.10
This commit was generated by merge_to_master.py.
Change-Id: I7a3a1838fe1d01e3d29886fc52aa980c2c3f2783
Diffstat (limited to 'android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk')
-rw-r--r-- | android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk index 204cd16054..1c6003db0e 100644 --- a/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk @@ -19,7 +19,7 @@ $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resour $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" |