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 23444072: Use libyuv in Android VideoCaptureController (not for Android WebView) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finished libyuv rotation+letterboxing. Created 7 years, 3 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
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 11 matching lines...) Expand all
22 22
23 # contentview and its dependencies 23 # contentview and its dependencies
24 LOCAL_AIDL_INCLUDES := \ 24 LOCAL_AIDL_INCLUDES := \
25 $(LOCAL_PATH)/../content/public/android/java/src \ 25 $(LOCAL_PATH)/../content/public/android/java/src \
26 $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src 26 $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src
27 LOCAL_SRC_FILES += \ 27 LOCAL_SRC_FILES += \
28 $(call all-java-files-under, ../content/public/android/java/src) \ 28 $(call all-java-files-under, ../content/public/android/java/src) \
29 ../content/public/android/java/src/org/chromium/content/common/IChildProcess Callback.aidl \ 29 ../content/public/android/java/src/org/chromium/content/common/IChildProcess Callback.aidl \
30 ../content/public/android/java/src/org/chromium/content/common/IChildProcess Service.aidl \ 30 ../content/public/android/java/src/org/chromium/content/common/IChildProcess Service.aidl \
31 $(call all-java-files-under, ../base/android/java/src) \ 31 $(call all-java-files-under, ../base/android/java/src) \
32 $(call all-java-files-under, ../media/base/android/java/src) \
33 $(call all-java-files-under, ../net/android/java/src) \ 32 $(call all-java-files-under, ../net/android/java/src) \
34 $(call all-java-files-under, ../ui/android/java/src) \ 33 $(call all-java-files-under, ../ui/android/java/src) \
35 $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \ 34 $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \
36 $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src) 35 $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)
37 36
38 # browser components 37 # browser components
39 LOCAL_SRC_FILES += \ 38 LOCAL_SRC_FILES += \
40 $(call all-java-files-under, \ 39 $(call all-java-files-under, \
41 ../components/web_contents_delegate_android/android/java/src) \ 40 ../components/web_contents_delegate_android/android/java/src) \
42 $(call all-java-files-under, \ 41 $(call all-java-files-under, \
43 ../components/navigation_interception/android/java/src) \ 42 ../components/navigation_interception/android/java/src) \
44 43
45 # This directory includes .java files that are generated by the normal gyp build , but are checked in 44 # This directory includes .java files that are generated by the normal gyp build , but are checked in
46 # for the Android build. 45 # for the Android build.
47 # TODO(torne, cjhopman): Consider removing this. 46 # TODO(torne, cjhopman): Consider removing this.
48 LOCAL_SRC_FILES += \ 47 LOCAL_SRC_FILES += \
49 $(call all-java-files-under, java/generated_src) 48 $(call all-java-files-under, java/generated_src)
50 49
51 # Java files generated from .template rules. This list should match list of java dependencies in 50 # Java files generated from .template rules. This list should match list of java dependencies in
52 # android_webview/all_webview.gyp 51 # android_webview/all_webview.gyp
53 LOCAL_GENERATED_SOURCES := \ 52 LOCAL_GENERATED_SOURCES := \
54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ActivitySta te.java \ 53 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ActivitySta te.java \
55 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \ 54 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress ureLevelList.java \
56 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ PageTransitionTypes.java \ 55 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ PageTransitionTypes.java \
57 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ SpeechRecognitionError.java \ 56 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ SpeechRecognitionError.java \
58 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \ 57 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/R esultCodes.java \
59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageForma t.java \
60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateM imeType.java \ 58 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateM imeType.java \
61 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyRe sultAndroid.java \ 59 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyRe sultAndroid.java \
62 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.jav a \ 60 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.jav a \
63 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \ 61 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/PrivateKeyTy pe.java \
64 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDis position.java \ 62 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/ui/WindowOpenDis position.java \
65 63
66 # content dependencies on java components that are provided by the system on 64 # content dependencies on java components that are provided by the system on
67 # android 65 # android
68 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava 66 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
69 67
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak 387 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
390 LOCAL_MODULE_STEM := zh-CN 388 LOCAL_MODULE_STEM := zh-CN
391 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak 389 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
392 include $(LOCAL_PATH)/webview_pak.mk 390 include $(LOCAL_PATH)/webview_pak.mk
393 391
394 include $(CLEAR_VARS) 392 include $(CLEAR_VARS)
395 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak 393 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
396 LOCAL_MODULE_STEM := zh-TW 394 LOCAL_MODULE_STEM := zh-TW
397 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak 395 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
398 include $(LOCAL_PATH)/webview_pak.mk 396 include $(LOCAL_PATH)/webview_pak.mk
OLDNEW
« no previous file with comments | « no previous file | android_webview/all_webview.gyp » ('j') | content/browser/renderer_host/media/video_capture_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698