android_webview/Android.mk - Issue 332343007: [android_webview] Fix Android.mk module dependencies.

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/Android.mk

Issue 332343007: [android_webview] Fix Android.mk module dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 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 package provides the parts of the WebView java code which live in the	5 # This package provides the parts of the WebView java code which live in the

6 # Chromium tree. This is built into a static library so it can be used by the	6 # Chromium tree. This is built into a static library so it can be used by the

7 # glue layer in the Android tree.	7 # glue layer in the Android tree.

8	8

9 LOCAL_PATH := $(call my-dir)	9 LOCAL_PATH := $(call my-dir)

10 include $(CLEAR_VARS)	10 include $(CLEAR_VARS)

11	11

12 LOCAL_MODULE := android_webview_java	12 LOCAL_MODULE := android_webview_java

13	13

14 LOCAL_MODULE_TAGS := optional	14 LOCAL_MODULE_TAGS := optional

15	15

16 LOCAL_ADDITIONAL_DEPENDENCIES := android_webview_java_with_new_resources	16 # Temporary extra dependency: force android_webview_java_with_new_resources to

	17 # be built whenever this target is built, so that we get build coverage until

	18 # the switch happens.

	19 LOCAL_ADDITIONAL_DEPENDENCIES := \

	20 $(call intermediates-dir-for,JAVA_LIBRARIES,android_webview_java_with_new_re sources,,COMMON)/javalib.jar

	21

17	22

18 include $(LOCAL_PATH)/java_library_common.mk	23 include $(LOCAL_PATH)/java_library_common.mk

19 # resource glue layer	24 # resource glue layer

20 LOCAL_SRC_FILES += \	25 LOCAL_SRC_FILES += \

21 $(call all-java-files-under, ../content/public/android/java/resource_map) \	26 $(call all-java-files-under, ../content/public/android/java/resource_map) \

22 $(call all-java-files-under, ../ui/android/java/resource_map) \	27 $(call all-java-files-under, ../ui/android/java/resource_map) \

23	28

24 include $(BUILD_STATIC_JAVA_LIBRARY)	29 include $(BUILD_STATIC_JAVA_LIBRARY)

25	30

26 ########################################################	31 ########################################################

(...skipping 339 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
366 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak	371 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak

367 LOCAL_MODULE_STEM := zh-CN	372 LOCAL_MODULE_STEM := zh-CN

368 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak	373 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak

369 include $(LOCAL_PATH)/webview_pak.mk	374 include $(LOCAL_PATH)/webview_pak.mk

370	375

371 include $(CLEAR_VARS)	376 include $(CLEAR_VARS)

372 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak	377 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak

373 LOCAL_MODULE_STEM := zh-TW	378 LOCAL_MODULE_STEM := zh-TW

374 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak	379 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak

375 include $(LOCAL_PATH)/webview_pak.mk	380 include $(LOCAL_PATH)/webview_pak.mk

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »