android_webview/java_library_common.mk - Issue 834133004: Don't initialize C++ constants in Java during JNI registration.

Side by Side Diff: android_webview/java_library_common.mk

Issue 834133004: Don't initialize C++ constants in Java during JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: multi-line package name yet again Created 5 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

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | android_webview/libwebviewchromium.gypi » ('j') | no next file with comments »

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 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 LOCAL_SDK_VERSION := 21	5 LOCAL_SDK_VERSION := 21

6	6

7 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)	7 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)

8	8

9 # contentview and its dependencies	9 # contentview and its dependencies

10 LOCAL_AIDL_INCLUDES := \	10 LOCAL_AIDL_INCLUDES := \

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 LOCAL_GENERATED_SOURCES := \	47 LOCAL_GENERATED_SOURCES := \

48 $(call intermediates-dir-for,GYP,shared)/enums/android_resource_type_java/org/ch romium/ui/resources/AndroidResourceType.java \	48 $(call intermediates-dir-for,GYP,shared)/enums/android_resource_type_java/org/ch romium/ui/resources/AndroidResourceType.java \

49 $(call intermediates-dir-for,GYP,shared)/enums/bitmap_format_java/org/chromium/u i/gfx/BitmapFormat.java \	49 $(call intermediates-dir-for,GYP,shared)/enums/bitmap_format_java/org/chromium/u i/gfx/BitmapFormat.java \

50 $(call intermediates-dir-for,GYP,shared)/enums/cert_verify_status_android_java/o rg/chromium/net/CertVerifyStatusAndroid.java \	50 $(call intermediates-dir-for,GYP,shared)/enums/cert_verify_status_android_java/o rg/chromium/net/CertVerifyStatusAndroid.java \

51 $(call intermediates-dir-for,GYP,shared)/enums/certificate_mime_types_java/org/c hromium/net/CertificateMimeType.java \	51 $(call intermediates-dir-for,GYP,shared)/enums/certificate_mime_types_java/org/c hromium/net/CertificateMimeType.java \

52 $(call intermediates-dir-for,GYP,shared)/enums/network_change_notifier_types_jav a/org/chromium/net/ConnectionSubtype.java \	52 $(call intermediates-dir-for,GYP,shared)/enums/network_change_notifier_types_jav a/org/chromium/net/ConnectionSubtype.java \

53 $(call intermediates-dir-for,GYP,shared)/enums/network_change_notifier_types_jav a/org/chromium/net/ConnectionType.java \	53 $(call intermediates-dir-for,GYP,shared)/enums/network_change_notifier_types_jav a/org/chromium/net/ConnectionType.java \

54 $(call intermediates-dir-for,GYP,shared)/enums/content_gamepad_mapping/org/chrom ium/content/browser/input/CanonicalAxisIndex.java \	54 $(call intermediates-dir-for,GYP,shared)/enums/content_gamepad_mapping/org/chrom ium/content/browser/input/CanonicalAxisIndex.java \

55 $(call intermediates-dir-for,GYP,shared)/enums/content_gamepad_mapping/org/chrom ium/content/browser/input/CanonicalButtonIndex.java \	55 $(call intermediates-dir-for,GYP,shared)/enums/content_gamepad_mapping/org/chrom ium/content/browser/input/CanonicalButtonIndex.java \

56 $(call intermediates-dir-for,GYP,shared)/enums/gesture_event_type_java/org/chrom ium/content/browser/GestureEventType.java \	56 $(call intermediates-dir-for,GYP,shared)/enums/gesture_event_type_java/org/chrom ium/content/browser/GestureEventType.java \

	57 $(call intermediates-dir-for,GYP,shared)/enums/navigation_controller_java/org/ch romium/content_public/browser/navigation_controller/LoadURLType.java \

	58 $(call intermediates-dir-for,GYP,shared)/enums/navigation_controller_java/org/ch romium/content_public/browser/navigation_controller/UserAgentOverrideOption.java \

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

58 $(call intermediates-dir-for,GYP,shared)/enums/private_key_types_java/org/chromi um/net/PrivateKeyType.java \	60 $(call intermediates-dir-for,GYP,shared)/enums/private_key_types_java/org/chromi um/net/PrivateKeyType.java \

59 $(call intermediates-dir-for,GYP,shared)/enums/result_codes_java/org/chromium/co ntent_public/common/ResultCode.java \	61 $(call intermediates-dir-for,GYP,shared)/enums/result_codes_java/org/chromium/co ntent_public/common/ResultCode.java \

60 $(call intermediates-dir-for,GYP,shared)/enums/screen_orientation_values_java/or g/chromium/content_public/common/ScreenOrientationValues.java \	62 $(call intermediates-dir-for,GYP,shared)/enums/screen_orientation_values_java/or g/chromium/content_public/common/ScreenOrientationValues.java \

61 $(call intermediates-dir-for,GYP,shared)/enums/selection_event_type_java/org/chr omium/ui/touch_selection/SelectionEventType.java \	63 $(call intermediates-dir-for,GYP,shared)/enums/selection_event_type_java/org/chr omium/ui/touch_selection/SelectionEventType.java \

62 $(call intermediates-dir-for,GYP,shared)/enums/speech_recognition_error_java/org /chromium/content_public/common/SpeechRecognitionErrorCode.java \	64 $(call intermediates-dir-for,GYP,shared)/enums/speech_recognition_error_java/org /chromium/content_public/common/SpeechRecognitionErrorCode.java \

63 $(call intermediates-dir-for,GYP,shared)/enums/top_controls_state_java/org/chrom ium/content_public/common/TopControlsState.java \	65 $(call intermediates-dir-for,GYP,shared)/enums/top_controls_state_java/org/chrom ium/content_public/common/TopControlsState.java \

64 $(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/ chromium/ui/WindowOpenDisposition.java \	66 $(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/ chromium/ui/WindowOpenDisposition.java \

65 $(call intermediates-dir-for,GYP,shared)/enums/base_java_application_state/org/c hromium/base/ApplicationState.java \	67 $(call intermediates-dir-for,GYP,shared)/enums/base_java_application_state/org/c hromium/base/ApplicationState.java \

66 $(call intermediates-dir-for,GYP,shared)/enums/base_java_library_load_from_apk_s tatus_codes/org/chromium/base/library_loader/LibraryLoadFromApkStatusCodes.java \	68 $(call intermediates-dir-for,GYP,shared)/enums/base_java_library_load_from_apk_s tatus_codes/org/chromium/base/library_loader/LibraryLoadFromApkStatusCodes.java \

67 $(call intermediates-dir-for,GYP,shared)/enums/base_java_memory_pressure_level/o rg/chromium/base/MemoryPressureLevel.java \	69 $(call intermediates-dir-for,GYP,shared)/enums/base_java_memory_pressure_level/o rg/chromium/base/MemoryPressureLevel.java \

68 $(call intermediates-dir-for,GYP,shared)/enums/media_android_imageformat/org/chr omium/media/AndroidImageFormat.java \	70 $(call intermediates-dir-for,GYP,shared)/enums/media_android_imageformat/org/chr omium/media/AndroidImageFormat.java \

69 $(call intermediates-dir-for,GYP,shared)/enums/page_transition_types_java/org/ch romium/ui/base/PageTransition.java \	71 $(call intermediates-dir-for,GYP,shared)/enums/page_transition_types_java/org/ch romium/ui/base/PageTransition.java \

70 $(call intermediates-dir-for,GYP,shared)/enums/system_ui_resource_type_java/org/ chromium/ui/resources/SystemUIResourceType.java \	72 $(call intermediates-dir-for,GYP,shared)/enums/system_ui_resource_type_java/org/ chromium/ui/resources/SystemUIResourceType.java \

71 $(call intermediates-dir-for,GYP,shared)/enums/text_input_type_java/org/chromium /ui/base/ime/TextInputType.java \	73 $(call intermediates-dir-for,GYP,shared)/enums/text_input_type_java/org/chromium /ui/base/ime/TextInputType.java \

72 $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chrom ium/ui/base/HoverType.java \	74 $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chrom ium/ui/base/HoverType.java \

73 $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chrom ium/ui/base/PointerType.java \	75 $(call intermediates-dir-for,GYP,shared)/enums/touch_device_types_java/org/chrom ium/ui/base/PointerType.java \

	76 $(call intermediates-dir-for,GYP,shared)/enums/web_input_event_java/org/chromium /blink_public/web/WebInputEventModifier.java \

	77 $(call intermediates-dir-for,GYP,shared)/enums/web_input_event_java/org/chromium /blink_public/web/WebInputEventType.java \

	78 $(call intermediates-dir-for,GYP,shared)/enums/web_text_input_type/org/chromium/ blink_public/web/WebTextInputFlags.java \

74 $(call intermediates-dir-for,GYP,shared)/templates/net_errors_java/org/chromium/ net/NetError.java \	79 $(call intermediates-dir-for,GYP,shared)/templates/net_errors_java/org/chromium/ net/NetError.java \

75 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryMonitor.java \	80 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryMonitor.java \

76 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryMonitor_Internal.java \	81 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryMonitor_Internal.java \

77 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryStatus.java \	82 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/ src/org/chromium/mojom/device/BatteryStatus.java \

78	83

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

80 # android	85 # android

81 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava	86 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava

82	87

OLD	NEW