android_webview/build/resources_config.mk - Issue 350173004: [android_webview] Enable new android_webview resource target on Android.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 350173004: [android_webview] Enable new android_webview resource target on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: put the slash in the right way around Created 6 years, 6 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 | Annotate | Revision Log

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 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml	5 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml

6	6

7 # resources	7 # Resources.

	8 # The res_hack folder is necessary to defeat a build system "optimization" which

	9 # ends up skipping running aapt if there are no resource files in any of the

	10 # resources dirs. Unfortunately, because all of our resources are generated at

	11 # build time and because this check is performed when processing the Makefile

	12 # it tests positive when building from clean resulting in a build failure.

	13 # We defeat the optimization by including an empty values.xml file in the list.

8 android_webview_resources_dirs := \	14 android_webview_resources_dirs := \

	15 $(call my-dir)/res_hack \

9 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webvie w_jarjar_content_resources/jarjar_res \	16 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webvie w_jarjar_content_resources/jarjar_res \

10 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webvie w_jarjar_ui_resources/jarjar_res \	17 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webvie w_jarjar_ui_resources/jarjar_res \

11 $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(TARGET_2ND_ARCH))/ui_str ings_grd/res_grit \	18 $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(TARGET_2ND_ARCH))/ui_str ings_grd/res_grit \

12 $(call intermediates-dir-for,GYP,content_strings_grd,,,$(TARGET_2ND_ARCH))/c ontent_strings_grd/res_grit	19 $(call intermediates-dir-for,GYP,content_strings_grd,,,$(TARGET_2ND_ARCH))/c ontent_strings_grd/res_grit

13	20

14 android_webview_aapt_flags := --auto-add-overlay	21 android_webview_aapt_flags := --auto-add-overlay

15 android_webview_aapt_flags += --custom-package com.android.webview.chromium	22 android_webview_aapt_flags += --custom-package com.android.webview.chromium

16 android_webview_aapt_flags += --extra-packages org.chromium.ui	23 android_webview_aapt_flags += --extra-packages org.chromium.ui

17 android_webview_aapt_flags += --extra-packages org.chromium.content	24 android_webview_aapt_flags += --extra-packages org.chromium.content

OLD	NEW

« no previous file with comments | « android_webview/build/res_hack/values/values.xml ('k') | no next file » | no next file with comments »