android_webview/Android.mk - Issue 159173002: Refactor ActivityStatus to not store current activity

Side by Side Diff: android_webview/Android.mk

Issue 159173002: Refactor ActivityStatus to not store current activity (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | android_webview/all_webview.gyp » ('j') | net/disk_cache/simple/simple_index.cc » ('J')

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 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47	47

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

49 # for the Android build.	49 # for the Android build.

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

51 LOCAL_SRC_FILES += \	51 LOCAL_SRC_FILES += \

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

53	53

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

55 # android_webview/all_webview.gyp	55 # android_webview/all_webview.gyp

56 LOCAL_GENERATED_SOURCES := \	56 LOCAL_GENERATED_SOURCES := \

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

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

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

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

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

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

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

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

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

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

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

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

395 LOCAL_MODULE_STEM := zh-CN	395 LOCAL_MODULE_STEM := zh-CN

396 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak	396 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak

397 include $(LOCAL_PATH)/webview_pak.mk	397 include $(LOCAL_PATH)/webview_pak.mk

398	398

399 include $(CLEAR_VARS)	399 include $(CLEAR_VARS)

400 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak	400 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak

401 LOCAL_MODULE_STEM := zh-TW	401 LOCAL_MODULE_STEM := zh-TW

402 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak	402 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak

403 include $(LOCAL_PATH)/webview_pak.mk	403 include $(LOCAL_PATH)/webview_pak.mk

OLD	NEW