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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: android_webview/Android.mk

Issue 17084002: [Android WebView] Fix build after r206398 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
« 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # TODO(torne, cjhopman): Consider removing this. 47 # TODO(torne, cjhopman): Consider removing this.
48 LOCAL_SRC_FILES += \ 48 LOCAL_SRC_FILES += \
49 $(call all-java-files-under, java/generated_src) 49 $(call all-java-files-under, java/generated_src)
50 50
51 # Java files generated from .template rules. This list should match list of java dependencies in 51 # Java files generated from .template rules. This list should match list of java dependencies in
52 # android_webview/all_webview.gyp 52 # android_webview/all_webview.gyp
53 LOCAL_GENERATED_SOURCES := \ 53 LOCAL_GENERATED_SOURCES := \
54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ActivitySta te.java \ 54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ActivitySta te.java \
55 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \ 55 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \
56 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ PageTransitionTypes.java \ 56 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ PageTransitionTypes.java \
57 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ SpeechRecognitionError.java \
57 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \ 58 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \
58 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateM imeType.java \ 59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateM imeType.java \
59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyRe sultAndroid.java \ 60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyRe sultAndroid.java \
60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.jav a \ 61 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.jav a \
61 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \ 62 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \
62 63
63 # content dependencies on java components that are provided by the system on 64 # content dependencies on java components that are provided by the system on
64 # android 65 # android
65 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava 66 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
66 67
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak 387 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
387 LOCAL_MODULE_STEM := zh-CN 388 LOCAL_MODULE_STEM := zh-CN
388 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak 389 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
389 include $(LOCAL_PATH)/webview_pak.mk 390 include $(LOCAL_PATH)/webview_pak.mk
390 391
391 include $(CLEAR_VARS) 392 include $(CLEAR_VARS)
392 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak 393 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
393 LOCAL_MODULE_STEM := zh-TW 394 LOCAL_MODULE_STEM := zh-TW
394 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak 395 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
395 include $(LOCAL_PATH)/webview_pak.mk 396 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