android_webview/build/resources_config.mk - Issue 950223002: Android: Move resources for validation message bubble to components/web_contents_delegate_android/.

Side by Side Diff: android_webview/build/resources_config.mk

Issue 950223002: Android: Move resources for validation message bubble to components/web_contents_delegate_android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add per-file entries Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « android_webview/android_webview.gyp ('k') | components/OWNERS » ('j') | no next file with comments »

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 # This file defines resources-related build variables which are shared by the	5 # This file defines resources-related build variables which are shared by the

6 # android_webview/Android.mk file and the frameworks/webview/chromium/Android.mk	6 # android_webview/Android.mk file and the frameworks/webview/chromium/Android.mk

7 # file.	7 # file.

8	8

9 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml	9 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml

10	10

11 # Resources.	11 # Resources.

12 android_webview_resources_dirs := \	12 android_webview_resources_dirs := \

13 $(call my-dir)/../java/res \	13 $(call my-dir)/../java/res \

14 $(call my-dir)/../apk/java/res \	14 $(call my-dir)/../apk/java/res \

15 $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_reso urces/jarjar_res \	15 $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_reso urces/jarjar_res \

16 $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources /jarjar_res \	16 $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources /jarjar_res \

	17 $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_web_contents _delegate_android_resources/jarjar_res \

17 $(call intermediates-dir-for,GYP,ui_strings_grd)/ui_strings_grd/res_grit \	18 $(call intermediates-dir-for,GYP,ui_strings_grd)/ui_strings_grd/res_grit \

18 $(call intermediates-dir-for,GYP,content_strings_grd)/content_strings_grd/re s_grit \	19 $(call intermediates-dir-for,GYP,content_strings_grd)/content_strings_grd/re s_grit \

19 $(call intermediates-dir-for,GYP,android_webview_strings_grd)/android_webvie w_strings_grd/res_grit	20 $(call intermediates-dir-for,GYP,android_webview_strings_grd)/android_webvie w_strings_grd/res_grit

20	21

21 android_webview_asset_dirs := \	22 android_webview_asset_dirs := \

22 $(call intermediates-dir-for,APPS,webviewchromium-paks)	23 $(call intermediates-dir-for,APPS,webviewchromium-paks)

23	24

24 android_webview_aapt_flags := --auto-add-overlay	25 android_webview_aapt_flags := --auto-add-overlay

25 android_webview_aapt_flags += --extra-packages org.chromium.android_webview	26 android_webview_aapt_flags += --extra-packages org.chromium.android_webview

	27 android_webview_aapt_flags += --extra-packages org.chromium.components.web_conte nts_delegate_android

26 android_webview_aapt_flags += --extra-packages org.chromium.content	28 android_webview_aapt_flags += --extra-packages org.chromium.content

27 android_webview_aapt_flags += --extra-packages org.chromium.ui	29 android_webview_aapt_flags += --extra-packages org.chromium.ui

28 android_webview_aapt_flags += -0 pak	30 android_webview_aapt_flags += -0 pak

29 android_webview_aapt_flags += --ignore-assets '!OWNERS:!.svn:!.git:!.ds_store:!* .scc:.:<dir>_:!CVS:!thumbs.db:!picasa.ini:!*~'	31 android_webview_aapt_flags += --ignore-assets '!OWNERS:!.svn:!.git:!.ds_store:!* .scc:.:<dir>_:!CVS:!thumbs.db:!picasa.ini:!*~'

30	32

31 android_webview_system_pak_targets := \	33 android_webview_system_pak_targets := \

32 webviewchromium_pak \	34 webviewchromium_pak \

33 webviewchromium_webkit_strings_am.pak \	35 webviewchromium_webkit_strings_am.pak \

34 webviewchromium_webkit_strings_ar.pak \	36 webviewchromium_webkit_strings_ar.pak \

35 webviewchromium_webkit_strings_bg.pak \	37 webviewchromium_webkit_strings_bg.pak \

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 # This list will be used to force the .pak files to be copied into the	94 # This list will be used to force the .pak files to be copied into the

93 # intermediates folder before invoking appt from the Android 'glue layer'	95 # intermediates folder before invoking appt from the Android 'glue layer'

94 # makefile.	96 # makefile.

95 android_webview_intermediates_pak_additional_deps := \	97 android_webview_intermediates_pak_additional_deps := \

96 $(foreach name,$(android_webview_final_pak_names), \	98 $(foreach name,$(android_webview_final_pak_names), \

97 $(call intermediates-dir-for,APPS,webviewchromium-paks)/$(name))	99 $(call intermediates-dir-for,APPS,webviewchromium-paks)/$(name))

98	100

99 # This is the stamp file for the android_webview_resources target.	101 # This is the stamp file for the android_webview_resources target.

100 android_webview_resources_stamp := \	102 android_webview_resources_stamp := \

101 $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_re sources.stamp	103 $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_re sources.stamp

OLD	NEW