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

Side by Side Diff: android_webview/Android.mk

Issue 350173004: [android_webview] Enable new android_webview resource target on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put the slash in the right way around Created 6 years, 6 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/build/res_hack/values/values.xml » ('j') | no next file with comments »
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)
11 11
12 LOCAL_MODULE := android_webview_java 12 LOCAL_MODULE := android_webview_java
13 13
14 LOCAL_MODULE_TAGS := optional 14 LOCAL_MODULE_TAGS := optional
15 15
16 LOCAL_ADDITIONAL_DEPENDENCIES := android_webview_java_with_new_resources
17
16 include $(LOCAL_PATH)/java_library_common.mk 18 include $(LOCAL_PATH)/java_library_common.mk
17 # resource glue layer 19 # resource glue layer
18 LOCAL_SRC_FILES += \ 20 LOCAL_SRC_FILES += \
19 $(call all-java-files-under, ../content/public/android/java/resource_map) \ 21 $(call all-java-files-under, ../content/public/android/java/resource_map) \
20 $(call all-java-files-under, ../ui/android/java/resource_map) \ 22 $(call all-java-files-under, ../ui/android/java/resource_map) \
21 23
22 include $(BUILD_STATIC_JAVA_LIBRARY) 24 include $(BUILD_STATIC_JAVA_LIBRARY)
23 25
24 ######################################################## 26 ########################################################
25 # This is intended to replace android_webview_java once the Android side of 27 # This is intended to replace android_webview_java once the Android side of
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak 366 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
365 LOCAL_MODULE_STEM := zh-CN 367 LOCAL_MODULE_STEM := zh-CN
366 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak 368 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
367 include $(LOCAL_PATH)/webview_pak.mk 369 include $(LOCAL_PATH)/webview_pak.mk
368 370
369 include $(CLEAR_VARS) 371 include $(CLEAR_VARS)
370 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak 372 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
371 LOCAL_MODULE_STEM := zh-TW 373 LOCAL_MODULE_STEM := zh-TW
372 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak 374 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
373 include $(LOCAL_PATH)/webview_pak.mk 375 include $(LOCAL_PATH)/webview_pak.mk
OLDNEW
« no previous file with comments | « no previous file | android_webview/build/res_hack/values/values.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698