Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: android_webview/Android.mk

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: And fix android_webview_test_apk Created 7 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/android_webview.gyp » ('j') | build/java.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 include $(BUILD_STATIC_JAVA_LIBRARY) 59 include $(BUILD_STATIC_JAVA_LIBRARY)
60 60
61 61
62 ######################################################## 62 ########################################################
63 # These packages are the resource paks used by webview. 63 # These packages are the resource paks used by webview.
64 64
65 include $(CLEAR_VARS) 65 include $(CLEAR_VARS)
66 LOCAL_MODULE := webviewchromium_pak 66 LOCAL_MODULE := webviewchromium_pak
67 LOCAL_MODULE_STEM := webviewchromium 67 LOCAL_MODULE_STEM := webviewchromium
68 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak 68 LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium.pak
69 include $(LOCAL_PATH)/webview_pak.mk 69 include $(LOCAL_PATH)/webview_pak.mk
70 70
71 # TODO(benm): remove when downstream depends on localised paks. 71 # TODO(benm): remove when downstream depends on localised paks.
72 include $(CLEAR_VARS) 72 include $(CLEAR_VARS)
73 LOCAL_MODULE := webviewchromium_strings_pak 73 LOCAL_MODULE := webviewchromium_strings_pak
74 LOCAL_MODULE_STEM := webviewchromium_strings 74 LOCAL_MODULE_STEM := webviewchromium_strings
75 LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak 75 LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium_strings.pa k
76 include $(LOCAL_PATH)/webview_pak.mk 76 include $(LOCAL_PATH)/webview_pak.mk
77 77
78 include $(CLEAR_VARS) 78 include $(CLEAR_VARS)
79 LOCAL_MODULE := webviewchromium_webkit_strings_am.pak 79 LOCAL_MODULE := webviewchromium_webkit_strings_am.pak
80 LOCAL_MODULE_STEM := am 80 LOCAL_MODULE_STEM := am
81 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_am.pak 81 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_am.pak
82 include $(LOCAL_PATH)/webview_pak.mk 82 include $(LOCAL_PATH)/webview_pak.mk
83 83
84 include $(CLEAR_VARS) 84 include $(CLEAR_VARS)
85 LOCAL_MODULE := webviewchromium_webkit_strings_ar.pak 85 LOCAL_MODULE := webviewchromium_webkit_strings_ar.pak
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak 385 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
386 LOCAL_MODULE_STEM := zh-CN 386 LOCAL_MODULE_STEM := zh-CN
387 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak 387 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
388 include $(LOCAL_PATH)/webview_pak.mk 388 include $(LOCAL_PATH)/webview_pak.mk
389 389
390 include $(CLEAR_VARS) 390 include $(CLEAR_VARS)
391 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak 391 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
392 LOCAL_MODULE_STEM := zh-TW 392 LOCAL_MODULE_STEM := zh-TW
393 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak 393 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
394 include $(LOCAL_PATH)/webview_pak.mk 394 include $(LOCAL_PATH)/webview_pak.mk
OLDNEW
« no previous file with comments | « no previous file | android_webview/android_webview.gyp » ('j') | build/java.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698