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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: android_webview/Android.mk

Issue 22314005: [Android] On calling openNewTab, pass the disposition instead of incognito. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted copyright year update Created 7 years, 4 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/browser/ SpeechRecognitionError.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/content/common/R esultCodes.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/CertificateM imeType.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/CertVerifyRe sultAndroid.java \
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/NetError.jav a \
62 $(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 \
63 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDis position.java \
63 64
64 # content dependencies on java components that are provided by the system on 65 # content dependencies on java components that are provided by the system on
65 # android 66 # android
66 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava 67 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
67 68
68 include $(BUILD_STATIC_JAVA_LIBRARY) 69 include $(BUILD_STATIC_JAVA_LIBRARY)
69 70
70 71
71 ######################################################## 72 ########################################################
72 # These packages are the resource paks used by webview. 73 # These packages are the resource paks used by webview.
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak 388 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
388 LOCAL_MODULE_STEM := zh-CN 389 LOCAL_MODULE_STEM := zh-CN
389 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak 390 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
390 include $(LOCAL_PATH)/webview_pak.mk 391 include $(LOCAL_PATH)/webview_pak.mk
391 392
392 include $(CLEAR_VARS) 393 include $(CLEAR_VARS)
393 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak 394 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
394 LOCAL_MODULE_STEM := zh-TW 395 LOCAL_MODULE_STEM := zh-TW
395 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak 396 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
396 include $(LOCAL_PATH)/webview_pak.mk 397 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