android_webview/Android.mk - Issue 11822002: Fix downstream android webview build

Side by Side Diff: android_webview/Android.mk

Issue 11822002: Fix downstream android webview build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update comment Created 7 years, 11 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

« no previous file with comments | « no previous file | content/content.gyp » ('j') | no next file with comments »

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)

(...skipping 24 matching lines...) Expand all Loading...
35 $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \	35 $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \

36 $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)	36 $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)

37	37

38 # browser components	38 # browser components

39 LOCAL_SRC_FILES += \	39 LOCAL_SRC_FILES += \

40 $(call all-java-files-under, \	40 $(call all-java-files-under, \

41 ../content/components/web_contents_delegate_android/java/src) \	41 ../content/components/web_contents_delegate_android/java/src) \

42 $(call all-java-files-under, \	42 $(call all-java-files-under, \

43 ../content/components/navigation_interception/java/src) \	43 ../content/components/navigation_interception/java/src) \

44	44

	45

45 # Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java,	46 # Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java,

46 # and content.gyp:page_transition_types_java	47 # and content.gyp:page_transition_types_java

47 LOCAL_GENERATED_SOURCES := \	48 LOCAL_GENERATED_SOURCES := \

48 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.content.browser/ PageTransitionTypes.java \	49 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.content.browser/ PageTransitionTypes.java \

49 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/CertificateM imeType.java \	50 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/CertificateM imeType.java \

50 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.jav a	51 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.jav a

51	52

	53 # content dependencies on java components that are provided by the system on

	54 # android

	55 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava

52	56

53 include $(BUILD_STATIC_JAVA_LIBRARY)	57 include $(BUILD_STATIC_JAVA_LIBRARY)

54	58

55	59

56 ########################################################	60 ########################################################

57 # These packages are the resource paks used by webview.	61 # These packages are the resource paks used by webview.

58	62

59 include $(CLEAR_VARS)	63 include $(CLEAR_VARS)

60 LOCAL_MODULE := webviewchromium_pak	64 LOCAL_MODULE := webviewchromium_pak

61 LOCAL_MODULE_STEM := webviewchromium	65 LOCAL_MODULE_STEM := webviewchromium

62 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak	66 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak

63 include $(LOCAL_PATH)/webview_pak.mk	67 include $(LOCAL_PATH)/webview_pak.mk

64	68

65 # TODO(benm): remove when we get all our strings from java.	69 # TODO(benm): remove when we get all our strings from java.

66 include $(CLEAR_VARS)	70 include $(CLEAR_VARS)

67 LOCAL_MODULE := webviewchromium_strings_pak	71 LOCAL_MODULE := webviewchromium_strings_pak

68 LOCAL_MODULE_STEM := webviewchromium_strings	72 LOCAL_MODULE_STEM := webviewchromium_strings

69 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak	73 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak

70 include $(LOCAL_PATH)/webview_pak.mk	74 include $(LOCAL_PATH)/webview_pak.mk

OLD	NEW