android_webview/java_library_common.mk - Issue 599493004: Use the new java_cpp_enum rule in net.

Side by Side Diff: android_webview/java_library_common.mk

Issue 599493004: Use the new java_cpp_enum rule in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: one more aosp fix Created 6 years, 2 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 | build/get_landmines.py » ('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_SRC_FILES := $(call all-java-files-under, java/src)	5 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)

6	6

7 # contentview and its dependencies	7 # contentview and its dependencies

8 LOCAL_AIDL_INCLUDES := \	8 LOCAL_AIDL_INCLUDES := \

9 $(LOCAL_PATH)/../content/public/android/java/src \	9 $(LOCAL_PATH)/../content/public/android/java/src \

10 $(LOCAL_PATH)/../net/android/java/src \	10 $(LOCAL_PATH)/../net/android/java/src \

(...skipping 21 matching lines...) Expand all Loading...
32	32

33 # This directory includes .java files that are generated by the normal gyp build , but are checked in	33 # This directory includes .java files that are generated by the normal gyp build , but are checked in

34 # for the Android build.	34 # for the Android build.

35 # TODO(torne, cjhopman): Consider removing this.	35 # TODO(torne, cjhopman): Consider removing this.

36 LOCAL_SRC_FILES += \	36 LOCAL_SRC_FILES += \

37 $(call all-java-files-under, java/generated_src)	37 $(call all-java-files-under, java/generated_src)

38	38

39 # Java files generated from .template rules. This list should match list of java dependencies in	39 # Java files generated from .template rules. This list should match list of java dependencies in

40 # android_webview/android_webview.gyp	40 # android_webview/android_webview.gyp

41 LOCAL_GENERATED_SOURCES := \	41 LOCAL_GENERATED_SOURCES := \

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

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

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

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

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

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

44 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/Application State.java \	47 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/Application State.java \

45 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \	48 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \

46 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ GestureEventType.java \	49 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ GestureEventType.java \

47 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ SpeechRecognitionError.java \	50 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ SpeechRecognitionError.java \

48 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/CanonicalAxisIndex.java \	51 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/CanonicalAxisIndex.java \

49 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/CanonicalButtonIndex.java \	52 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/CanonicalButtonIndex.java \

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

51 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/SelectionEventType.java \	54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ input/SelectionEventType.java \

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

53 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/c ommon/ScreenOrientationValues.java \	56 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/c ommon/ScreenOrientationValues.java \

54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidIma geFormat.java \	57 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidIma geFormat.java \

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

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

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

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

59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/base/PageTran sitionTypes.java \	59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/base/PageTran sitionTypes.java \

60	60

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

62 # android	62 # android

63 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava	63 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava

64	64

OLD	NEW