android_webview/Android.mk - Issue 150983003: [Android] Share gesture types between Java and C++

Side by Side Diff: android_webview/Android.mk

Issue 150983003: [Android] Share gesture types between Java and C++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Really fix WebView Created 6 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

« no previous file with comments | « no previous file | android_webview/all_webview.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 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 # for the Android build.	46 # for the Android build.

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/ GestureEventType.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/ PageTransitionTypes.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/browser/ SpeechRecognitionError.java \

58 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/PopupItemType.java \	59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/PopupItemType.java \

59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \	60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \

60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageForma t.java \	61 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageForma t.java \

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

62 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifySt atusAndroid.java \	63 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifySt atusAndroid.java \

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

64 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \	65 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \

65 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDis position.java \	66 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDis position.java \

(...skipping 324 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
390 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak	391 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak

391 LOCAL_MODULE_STEM := zh-CN	392 LOCAL_MODULE_STEM := zh-CN

392 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak	393 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak

393 include $(LOCAL_PATH)/webview_pak.mk	394 include $(LOCAL_PATH)/webview_pak.mk

394	395

395 include $(CLEAR_VARS)	396 include $(CLEAR_VARS)

396 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak	397 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak

397 LOCAL_MODULE_STEM := zh-TW	398 LOCAL_MODULE_STEM := zh-TW

398 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak	399 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak

399 include $(LOCAL_PATH)/webview_pak.mk	400 include $(LOCAL_PATH)/webview_pak.mk

OLD	NEW