Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: android_webview/Android.mk

Issue 12210130: [Android WebView] Fix build break, make sure the gyp file is generated for android webview (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | android_webview/all_webview.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 26 matching lines...) Expand all
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 ../components/web_contents_delegate_android/android/java/src) \ 41 ../components/web_contents_delegate_android/android/java/src) \
42 $(call all-java-files-under, \ 42 $(call all-java-files-under, \
43 ../components/navigation_interception/android/java/src) \ 43 ../components/navigation_interception/android/java/src) \
44 44
45 45
46 # 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,
47 # and content.gyp:page_transition_types_java 47 # and content.gyp:page_transition_types_java
boliu 2013/02/12 02:26:16 I think this comment is getting out of hand. Vote
Kristian Monsen 2013/02/12 03:02:37 Just updated the comment for now, but agree it sho
48 LOCAL_GENERATED_SOURCES := \ 48 LOCAL_GENERATED_SOURCES := \
49 $(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 \
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/CertificateM imeType.java \
51 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/PrivateKeyTy pe.java \
51 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.jav a 52 $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.jav a
52 53
53 # content dependencies on java components that are provided by the system on 54 # content dependencies on java components that are provided by the system on
54 # android 55 # android
55 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava 56 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
56 57
57 include $(BUILD_STATIC_JAVA_LIBRARY) 58 include $(BUILD_STATIC_JAVA_LIBRARY)
58 59
59 60
60 ######################################################## 61 ########################################################
61 # These packages are the resource paks used by webview. 62 # These packages are the resource paks used by webview.
62 63
63 include $(CLEAR_VARS) 64 include $(CLEAR_VARS)
64 LOCAL_MODULE := webviewchromium_pak 65 LOCAL_MODULE := webviewchromium_pak
65 LOCAL_MODULE_STEM := webviewchromium 66 LOCAL_MODULE_STEM := webviewchromium
66 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak 67 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak
67 include $(LOCAL_PATH)/webview_pak.mk 68 include $(LOCAL_PATH)/webview_pak.mk
68 69
69 # TODO(benm): remove when we get all our strings from java. 70 # TODO(benm): remove when we get all our strings from java.
70 include $(CLEAR_VARS) 71 include $(CLEAR_VARS)
71 LOCAL_MODULE := webviewchromium_strings_pak 72 LOCAL_MODULE := webviewchromium_strings_pak
72 LOCAL_MODULE_STEM := webviewchromium_strings 73 LOCAL_MODULE_STEM := webviewchromium_strings
73 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak 74 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak
74 include $(LOCAL_PATH)/webview_pak.mk 75 include $(LOCAL_PATH)/webview_pak.mk
OLDNEW
« no previous file with comments | « no previous file | android_webview/all_webview.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698