android_webview/Android.mk - Issue 11293017: Move navigation interception component to content/components

Side by Side Diff: android_webview/Android.mk

Issue 11293017: Move navigation interception component to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add findbugs suppression for compatibility code. Created 8 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | android_webview/DEPS » ('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 11 matching lines...) Expand all Loading...
22 ../content/public/android/java/src/org/chromium/content/common/ISandboxedPro cessCallback.aidl \	22 ../content/public/android/java/src/org/chromium/content/common/ISandboxedPro cessCallback.aidl \

23 ../content/public/android/java/src/org/chromium/content/common/ISandboxedPro cessService.aidl \	23 ../content/public/android/java/src/org/chromium/content/common/ISandboxedPro cessService.aidl \

24 $(call all-java-files-under, ../base/android/java/src) \	24 $(call all-java-files-under, ../base/android/java/src) \

25 $(call all-java-files-under, ../media/base/android/java/src) \	25 $(call all-java-files-under, ../media/base/android/java/src) \

26 $(call all-java-files-under, ../net/android/java/src) \	26 $(call all-java-files-under, ../net/android/java/src) \

27 $(call all-java-files-under, ../ui/android/java/src) \	27 $(call all-java-files-under, ../ui/android/java/src) \

28	28

29 # browser components	29 # browser components

30 LOCAL_SRC_FILES += \	30 LOCAL_SRC_FILES += \

31 $(call all-java-files-under, ../chrome/browser/component/web_contents_delega te_android/java/src) \	31 $(call all-java-files-under, ../chrome/browser/component/web_contents_delega te_android/java/src) \

32 $(call all-java-files-under, ../chrome/browser/component/navigation_intercep tion/java/src) \	32 $(call all-java-files-under, \

	33 ../content/components/navigation_interception/java/src) \

33	34

34 # TODO(mkosiba): Remove chromium_chrome dep once required browser	35 # TODO(mkosiba): Remove chromium_chrome dep once required browser

35 # components are in (replace it with contentview).	36 # components are in (replace it with contentview).

36 LOCAL_SRC_FILES += \	37 LOCAL_SRC_FILES += \

37 $(call all-java-files-under, ../chrome/android/java/src) \	38 $(call all-java-files-under, ../chrome/android/java/src) \

38	39

39 # This file is generated by net.gyp:net_errors_java	40 # This file is generated by net.gyp:net_errors_java

40 LOCAL_GENERATED_SOURCES := $(call intermediates-dir-for,GYP,shared)/net/template /NetError.java \	41 LOCAL_GENERATED_SOURCES := $(call intermediates-dir-for,GYP,shared)/net/template /NetError.java \

41	42

42 include $(BUILD_STATIC_JAVA_LIBRARY)	43 include $(BUILD_STATIC_JAVA_LIBRARY)

(...skipping 11 matching lines...) Expand all Loading...
54 LOCAL_MODULE := webviewchromium_res_chrome_100_percent	55 LOCAL_MODULE := webviewchromium_res_chrome_100_percent

55 LOCAL_MODULE_STEM := chrome_100_percent	56 LOCAL_MODULE_STEM := chrome_100_percent

56 include $(LOCAL_PATH)/webview_pak.mk	57 include $(LOCAL_PATH)/webview_pak.mk

57	58

58 # TODO(torne): add other locales (filtered by PRODUCT_LOCALES?)	59 # TODO(torne): add other locales (filtered by PRODUCT_LOCALES?)

59 include $(CLEAR_VARS)	60 include $(CLEAR_VARS)

60 LOCAL_MODULE := webviewchromium_res_en-US	61 LOCAL_MODULE := webviewchromium_res_en-US

61 LOCAL_MODULE_STEM := en-US	62 LOCAL_MODULE_STEM := en-US

62 LOCAL_BUILT_MODULE_STEM := locales/en-US.pak	63 LOCAL_BUILT_MODULE_STEM := locales/en-US.pak

63 include $(LOCAL_PATH)/webview_pak.mk	64 include $(LOCAL_PATH)/webview_pak.mk

OLD	NEW