diff options
Diffstat (limited to 'android_webview')
6 files changed, 22 insertions, 431 deletions
diff --git a/android_webview/build/aosp_manifest_dev.xml b/android_webview/build/aosp_manifest_dev.xml deleted file mode 100644 index 89e9c9c..0000000 --- a/android_webview/build/aosp_manifest_dev.xml +++ /dev/null @@ -1,411 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - - <remote name="aosp_immutable" - fetch=".." /> - <remote name="aosp" - fetch=".." - review="https://android-review.googlesource.com/" /> - <default revision="refs/tags/android-4.4_r1" - remote="aosp_immutable" - sync-j="6" /> - - <project path="build" name="platform/build" groups="pdk" > - <copyfile src="core/root.mk" dest="Makefile" /> - </project> - <project path="abi/cpp" name="platform/abi/cpp" groups="pdk" /> - <project path="art" name="platform/art" /> - <project path="bionic" name="platform/bionic" groups="pdk" /> - <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" /> - <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" /> - <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" /> - <project path="cts" name="platform/cts" groups="cts" /> - <project path="dalvik" name="platform/dalvik" /> - <project path="developers/build" name="platform/developers/build" /> - <project path="developers/demos" name="platform/developers/demos" /> - <project path="developers/docs" name="platform/developers/docs" /> - <project path="developers/samples/android" name="platform/developers/samples/android" /> - <project path="development" name="platform/development" /> - <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" /> - <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" /> - <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" /> - <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" /> - <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" /> - <project path="device/common" name="device/common" /> - <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" /> - <project path="device/generic/common" name="device/generic/common" groups="pdk" /> - <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" /> - <project path="device/generic/mips" name="device/generic/mips" groups="pdk" /> - <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" /> - <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" /> - <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" /> - <project path="device/generic/x86" name="device/generic/x86" groups="pdk" /> - <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" /> - <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" /> - <project path="device/lge/hammerhead" name="device/lge/hammerhead" groups="device,hammerhead" /> - <project path="device/lge/hammerhead-kernel" name="device/lge/hammerhead-kernel" groups="device,hammerhead" /> - <project path="device/lge/mako" name="device/lge/mako" groups="device,mako" /> - <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,mako" /> - <project path="device/sample" name="device/sample" groups="pdk" /> - <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" /> - <project path="docs/source.android.com" name="platform/docs/source.android.com" /> - <project path="external/aac" name="platform/external/aac" groups="pdk" /> - <project path="external/android-clat" name="platform/external/android-clat" /> - <project path="external/android-mock" name="platform/external/android-mock" /> - <project path="external/ant-glob" name="platform/external/ant-glob" /> - <project path="external/antlr" name="platform/external/antlr" /> - <project path="external/apache-harmony" name="platform/external/apache-harmony" /> - <project path="external/apache-http" name="platform/external/apache-http" /> - <project path="external/apache-qp" name="platform/external/apache-qp" /> - <project path="external/apache-xml" name="platform/external/apache-xml" /> - <project path="external/arduino" name="platform/external/arduino" /> - <project path="external/bison" name="platform/external/bison" groups="pdk" /> - <project path="external/blktrace" name="platform/external/blktrace" /> - <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="pdk" /> - <project path="external/bouncycastle" name="platform/external/bouncycastle" /> - <project path="external/bsdiff" name="platform/external/bsdiff" groups="pdk" /> - <project path="external/bzip2" name="platform/external/bzip2" groups="pdk" /> - <project path="external/ceres-solver" name="platform/external/ceres-solver" /> - <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="pdk" /> - <project path="external/chromium" name="platform/external/chromium" /> - <project path="external/chromium-libpac" name="platform/external/chromium-libpac" /> - <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="pdk" /> - <project path="external/chromium_org" name="platform/external/chromium_org" revision="chromium-dev" remote="aosp" /> - <project path="external/clang" name="platform/external/clang" groups="pdk" /> - <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" /> - <project path="external/dexmaker" name="platform/external/dexmaker" /> - <project path="external/dhcpcd" name="platform/external/dhcpcd" /> - <project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" /> - <project path="external/doclava" name="platform/external/doclava" /> - <project path="external/dropbear" name="platform/external/dropbear" /> - <project path="external/droiddriver" name="platform/external/droiddriver" /> - <project path="external/e2fsprogs" name="platform/external/e2fsprogs" groups="pdk" /> - <project path="external/easymock" name="platform/external/easymock" /> - <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" /> - <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" /> - <project path="external/eigen" name="platform/external/eigen" /> - <project path="external/elfutils" name="platform/external/elfutils" /> - <project path="external/embunit" name="platform/external/embunit" /> - <project path="external/emma" name="platform/external/emma" /> - <project path="external/esd" name="platform/external/esd" /> - <project path="external/expat" name="platform/external/expat" groups="pdk" /> - <project path="external/eyes-free" name="platform/external/eyes-free" /> - <project path="external/fdlibm" name="platform/external/fdlibm" /> - <project path="external/flac" name="platform/external/flac" groups="pdk" /> - <project path="external/freetype" name="platform/external/freetype" groups="pdk" /> - <project path="external/fsck_msdos" name="platform/external/fsck_msdos" /> - <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" /> - <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="pdk" /> - <project path="external/genext2fs" name="platform/external/genext2fs" /> - <project path="external/giflib" name="platform/external/giflib" /> - <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> - <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" groups="pdk" /> - <project path="external/guava" name="platform/external/guava" /> - <project path="external/hamcrest" name="platform/external/hamcrest" /> - <project path="external/harfbuzz" name="platform/external/harfbuzz" /> - <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" /> - <project path="external/hyphenation" name="platform/external/hyphenation" /> - <project path="external/icu4c" name="platform/external/icu4c" groups="pdk" /> - <project path="external/iproute2" name="platform/external/iproute2" groups="pdk" /> - <project path="external/ipsec-tools" name="platform/external/ipsec-tools" /> - <project path="external/iptables" name="platform/external/iptables" /> - <project path="external/iputils" name="platform/external/iputils" /> - <project path="external/jack" name="platform/external/jack" /> - <project path="external/javasqlite" name="platform/external/javasqlite" /> - <project path="external/javassist" name="platform/external/javassist" /> - <project path="external/jdiff" name="platform/external/jdiff" /> - <project path="external/jhead" name="platform/external/jhead" groups="pdk" /> - <project path="external/jmdns" name="platform/external/jmdns" /> - <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" /> - <project path="external/jpeg" name="platform/external/jpeg" groups="pdk" /> - <project path="external/jsilver" name="platform/external/jsilver" /> - <project path="external/jsr305" name="platform/external/jsr305" /> - <project path="external/junit" name="platform/external/junit" /> - <project path="external/kernel-headers" name="platform/external/kernel-headers" /> - <project path="external/libcap-ng" name="platform/external/libcap-ng" /> - <project path="external/libffi" name="platform/external/libffi" /> - <project path="external/libgsm" name="platform/external/libgsm" groups="pdk" /> - <project path="external/liblzf" name="platform/external/liblzf" groups="pdk" /> - <project path="external/libmtp" name="platform/external/libmtp" /> - <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="pdk" /> - <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="pdk" /> - <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="pdk" /> - <project path="external/libogg" name="platform/external/libogg" /> - <project path="external/libpcap" name="platform/external/libpcap" /> - <project path="external/libphonenumber" name="platform/external/libphonenumber" /> - <project path="external/libpng" name="platform/external/libpng" groups="pdk" /> - <project path="external/libppp" name="platform/external/libppp" /> - <project path="external/libselinux" name="platform/external/libselinux" groups="pdk" /> - <project path="external/libsepol" name="platform/external/libsepol" groups="pdk" /> - <project path="external/libusb" name="platform/external/libusb" /> - <project path="external/libusb-compat" name="platform/external/libusb-compat" /> - <project path="external/libvorbis" name="platform/external/libvorbis" /> - <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" /> - <project path="external/libxml2" name="platform/external/libxml2" /> - <project path="external/libxslt" name="platform/external/libxslt" /> - <project path="external/libyuv" name="platform/external/libyuv" groups="libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> - <project path="external/littlemock" name="platform/external/littlemock" /> - <project path="external/llvm" name="platform/external/llvm" groups="pdk" /> - <project path="external/lzma" name="platform/external/lzma" /> - <project path="external/marisa-trie" name="platform/external/marisa-trie" /> - <project path="external/markdown" name="platform/external/markdown" /> - <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" /> - <project path="external/mesa3d" name="platform/external/mesa3d" /> - <project path="external/mksh" name="platform/external/mksh" groups="pdk" /> - <project path="external/mockito" name="platform/external/mockito" /> - <project path="external/mockwebserver" name="platform/external/mockwebserver" /> - <project path="external/mp4parser" name="platform/external/mp4parser" /> - <project path="external/mtpd" name="platform/external/mtpd" /> - <project path="external/naver-fonts" name="platform/external/naver-fonts" /> - <project path="external/netcat" name="platform/external/netcat" /> - <project path="external/netperf" name="platform/external/netperf" /> - <project path="external/neven" name="platform/external/neven" /> - <project path="external/nist-pkits" name="platform/external/nist-pkits" /> - <project path="external/nist-sip" name="platform/external/nist-sip" /> - <project path="external/noto-fonts" name="platform/external/noto-fonts" /> - <project path="external/oauth" name="platform/external/oauth" /> - <project path="external/objenesis" name="platform/external/objenesis" /> - <project path="external/okhttp" name="platform/external/okhttp" /> - <project path="external/open-vcdiff" name="platform/external/open-vcdiff" /> - <project path="external/opencv" name="platform/external/opencv" /> - <project path="external/openfst" name="platform/external/openfst" /> - <project path="external/openssh" name="platform/external/openssh" /> - <project path="external/openssl" name="platform/external/openssl" groups="pdk" /> - <project path="external/oprofile" name="platform/external/oprofile" /> - <project path="external/pixman" name="platform/external/pixman" /> - <project path="external/ppp" name="platform/external/ppp" /> - <project path="external/proguard" name="platform/external/proguard" groups="pdk-java" /> - <project path="external/protobuf" name="platform/external/protobuf" groups="pdk" /> - <project path="external/qemu" name="platform/external/qemu" /> - <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" /> - <project path="external/regex-re2" name="platform/external/regex-re2" /> - <project path="external/replicaisland" name="platform/external/replicaisland" /> - <project path="external/robolectric" name="platform/external/robolectric" /> - <project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" /> - <project path="external/scrypt" name="platform/external/scrypt" groups="pdk" /> - <project path="external/sepolicy" name="platform/external/sepolicy" groups="pdk" /> - <project path="external/sfntly" name="platform/external/sfntly" /> - <project path="external/sil-fonts" name="platform/external/sil-fonts" /> - <project path="external/skia" name="platform/external/skia" /> - <project path="external/smack" name="platform/external/smack" /> - <project path="external/smali" name="platform/external/smali" /> - <project path="external/sonivox" name="platform/external/sonivox" groups="pdk" /> - <project path="external/speex" name="platform/external/speex" groups="pdk" /> - <project path="external/sqlite" name="platform/external/sqlite" groups="pdk" /> - <project path="external/srec" name="platform/external/srec" /> - <project path="external/srtp" name="platform/external/srtp" /> - <project path="external/stlport" name="platform/external/stlport" groups="pdk" /> - <project path="external/strace" name="platform/external/strace" /> - <project path="external/stressapptest" name="platform/external/stressapptest" /> - <project path="external/svox" name="platform/external/svox" /> - <project path="external/tagsoup" name="platform/external/tagsoup" /> - <project path="external/tcpdump" name="platform/external/tcpdump" /> - <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" /> - <project path="external/tinyalsa" name="platform/external/tinyalsa" groups="pdk" /> - <project path="external/tinycompress" name="platform/external/tinycompress" groups="pdk" /> - <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" /> - <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk" /> - <project path="external/tremolo" name="platform/external/tremolo" groups="pdk" /> - <project path="external/v8" name="platform/external/v8" /> - <project path="external/valgrind" name="platform/external/valgrind" groups="pdk" /> - <project path="external/webp" name="platform/external/webp" /> - <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" /> - <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" groups="pdk" /> - <project path="external/xmlwriter" name="platform/external/xmlwriter" /> - <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" /> - <project path="external/yaffs2" name="platform/external/yaffs2" groups="pdk" /> - <project path="external/zlib" name="platform/external/zlib" groups="pdk" /> - <project path="external/zxing" name="platform/external/zxing" /> - <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" /> - <project path="frameworks/base" name="platform/frameworks/base" /> - <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" /> - <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" /> - <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" /> - <project path="frameworks/ex" name="platform/frameworks/ex" /> - <project path="frameworks/mff" name="platform/frameworks/mff" /> - <project path="frameworks/ml" name="platform/frameworks/ml" /> - <project path="frameworks/native" name="platform/frameworks/native" groups="pdk" /> - <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" /> - <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" /> - <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" /> - <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" /> - <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" /> - <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" /> - <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" /> - <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" /> - <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" /> - <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" /> - <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" /> - <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="pdk" /> - <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" /> - <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" /> - <project path="frameworks/support" name="platform/frameworks/support" /> - <project path="frameworks/testing" name="platform/frameworks/testing" /> - <project path="frameworks/uiautomator" name="platform/frameworks/uiautomator" /> - <project path="frameworks/volley" name="platform/frameworks/volley" /> - <project path="frameworks/webview" name="platform/frameworks/webview" revision="chromium-dev" remote="aosp" /> - <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" /> - <project path="hardware/akm" name="platform/hardware/akm" /> - <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" /> - <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="broadcom_wlan" /> - <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense" /> - <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" /> - <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" /> - <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom" /> - <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom" /> - <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom" /> - <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="qcom" /> - <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom" /> - <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom" /> - <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960" /> - <project path="hardware/qcom/msm8x74" name="platform/hardware/qcom/msm8x74" groups="qcom_msm8x74" /> - <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom" /> - <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="qcom" /> - <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan" /> - <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" /> - <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="exynos5" /> - <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" /> - <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" groups="omap4" /> - <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" /> - <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" /> - <project path="libcore" name="platform/libcore" /> - <project path="libnativehelper" name="platform/libnativehelper" groups="pdk-java" /> - <project path="ndk" name="platform/ndk" /> - <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" /> - <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" /> - <project path="packages/apps/Browser" name="platform/packages/apps/Browser" /> - <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" /> - <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" /> - <project path="packages/apps/Camera" name="platform/packages/apps/Camera" /> - <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" /> - <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" /> - <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" /> - <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" /> - <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" /> - <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" /> - <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" /> - <project path="packages/apps/Email" name="platform/packages/apps/Email" /> - <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" /> - <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" /> - <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" /> - <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" /> - <project path="packages/apps/InCallUI" name="platform/packages/apps/InCallUI" /> - <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" /> - <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" /> - <project path="packages/apps/Launcher3" name="platform/packages/apps/Launcher3" /> - <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" /> - <project path="packages/apps/Mms" name="platform/packages/apps/Mms" /> - <project path="packages/apps/Music" name="platform/packages/apps/Music" /> - <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" /> - <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" /> - <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" /> - <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" /> - <project path="packages/apps/Phone" name="platform/packages/apps/Phone" /> - <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" /> - <project path="packages/apps/Protips" name="platform/packages/apps/Protips" /> - <project path="packages/apps/Provision" name="platform/packages/apps/Provision" /> - <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" /> - <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> - <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" /> - <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" /> - <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" /> - <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" /> - <project path="packages/apps/Stk" name="platform/packages/apps/Stk" /> - <project path="packages/apps/Tag" name="platform/packages/apps/Tag" /> - <project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail" /> - <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" /> - <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" /> - <project path="packages/experimental" name="platform/packages/experimental" /> - <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" /> - <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" /> - <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" /> - <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" /> - <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" /> - <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" /> - <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" /> - <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" /> - <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" /> - <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" /> - <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" /> - <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" /> - <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" /> - <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" /> - <project path="packages/services/Telephony" name="platform/packages/services/Telephony" /> - <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" /> - <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" /> - <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" /> - <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" /> - <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" /> - <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" /> - <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" /> - <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" /> - <project path="pdk" name="platform/pdk" groups="pdk" /> - <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="pdk,darwin" /> - <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="pdk,darwin" /> - <project path="prebuilts/clang/darwin-x86/arm/3.3" name="platform/prebuilts/clang/darwin-x86/arm/3.3" groups="darwin,arm" /> - <project path="prebuilts/clang/darwin-x86/host/3.3" name="platform/prebuilts/clang/darwin-x86/host/3.3" groups="darwin" /> - <project path="prebuilts/clang/darwin-x86/mips/3.3" name="platform/prebuilts/clang/darwin-x86/mips/3.3" groups="darwin,mips" /> - <project path="prebuilts/clang/darwin-x86/x86/3.3" name="platform/prebuilts/clang/darwin-x86/x86/3.3" groups="darwin,x86" /> - <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="pdk,linux" /> - <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="pdk,linux" /> - <project path="prebuilts/clang/linux-x86/arm/3.3" name="platform/prebuilts/clang/linux-x86/arm/3.3" groups="linux,arm" /> - <project path="prebuilts/clang/linux-x86/host/3.3" name="platform/prebuilts/clang/linux-x86/host/3.3" groups="linux" /> - <project path="prebuilts/clang/linux-x86/mips/3.3" name="platform/prebuilts/clang/linux-x86/mips/3.3" groups="linux,mips" /> - <project path="prebuilts/clang/linux-x86/x86/3.3" name="platform/prebuilts/clang/linux-x86/x86/3.3" groups="linux,x86" /> - <project path="prebuilts/devtools" name="platform/prebuilts/devtools" /> - <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="pdk" /> - <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" /> - <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" /> - <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="pdk,darwin,arm" /> - <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" groups="pdk,darwin,arm" /> - <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="pdk,darwin,arm" /> - <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" groups="pdk,darwin,arm" /> - <project path="prebuilts/gcc/darwin-x86/host/headers" name="platform/prebuilts/gcc/darwin-x86/host/headers" groups="pdk,darwin" /> - <project path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" groups="pdk,darwin" /> - <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="pdk,darwin,mips" /> - <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" groups="pdk,darwin,mips" /> - <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="pdk,darwin,x86" /> - <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" groups="pdk,darwin,x86" /> - <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.7" groups="pdk,darwin,x86" /> - <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="pdk,linux,arm" /> - <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm" /> - <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="pdk,linux,arm" /> - <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm" /> - <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" groups="pdk,linux" /> - <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" groups="pdk,linux" /> - <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" groups="pdk,linux" /> - <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="pdk,linux,mips" /> - <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" groups="pdk,linux,mips" /> - <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="pdk,linux,x86" /> - <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" groups="pdk,linux,x86" /> - <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.7" groups="pdk,linux,x86" /> - <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="pdk" /> - <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk" /> - <project path="prebuilts/python/darwin-x86/2.7.5" name="platform/prebuilts/python/darwin-x86/2.7.5" groups="darwin" /> - <project path="prebuilts/python/linux-x86/2.7.5" name="platform/prebuilts/python/linux-x86/2.7.5" groups="linux" /> - <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="pdk" /> - <project path="prebuilts/runtime" name="platform/prebuilts/runtime" /> - <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" /> - <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools" /> - <project path="sdk" name="platform/sdk" /> - <project path="system/core" name="platform/system/core" groups="pdk" /> - <project path="system/extras" name="platform/system/extras" groups="pdk" /> - <project path="system/media" name="platform/system/media" groups="pdk" /> - <project path="system/netd" name="platform/system/netd" groups="pdk" /> - <project path="system/security" name="platform/system/security" groups="pdk" /> - <project path="system/vold" name="platform/system/vold" groups="pdk" /> - <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" groups="notdefault,tools" /> - <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" /> - <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" /> - <project path="tools/build" name="platform/tools/build" groups="notdefault,tools" /> - <project path="tools/emulator" name="platform/tools/emulator" groups="notdefault,tools" /> - <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools" /> - <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" /> - <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" /> - <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,motodev" /> - <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools" /> - <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" /> - -</manifest> diff --git a/android_webview/buildbot/aosp_manifest.xml b/android_webview/buildbot/aosp_manifest.xml index d363420..f94ac3f 100644 --- a/android_webview/buildbot/aosp_manifest.xml +++ b/android_webview/buildbot/aosp_manifest.xml @@ -244,7 +244,7 @@ <project path="frameworks/testing" name="platform/frameworks/testing" /> <project path="frameworks/uiautomator" name="platform/frameworks/uiautomator" /> <project path="frameworks/volley" name="platform/frameworks/volley" /> - <project path="frameworks/webview" name="platform/frameworks/webview" revision="d36825d5b76e90f1ef4f54676cdf34b3bacd043b" remote="aosp" /> + <project path="frameworks/webview" name="platform/frameworks/webview" revision="33b9fe62cb3e853223e66ada9ef176a2ca2eb839" remote="aosp" /> <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" /> <project path="hardware/akm" name="platform/hardware/akm" /> <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" /> diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 86e6fa9..4027eeb 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -165,6 +165,7 @@ public class AwContents { private long mNativeAwContents; private final AwBrowserContext mBrowserContext; private final ViewGroup mContainerView; + private final Context mContext; private ContentViewCore mContentViewCore; private final AwContentsClient mContentsClient; private final AwContentViewClient mContentViewClient; @@ -459,17 +460,18 @@ public class AwContents { /** * @param browserContext the browsing context to associate this view contents with. * @param containerView the view-hierarchy item this object will be bound to. + * @param context the context to use, usually containerView.getContext(). * @param internalAccessAdapter to access private methods on containerView. * @param contentsClient will receive API callbacks from this WebView Contents. * @param awSettings AwSettings instance used to configure the AwContents. * * This constructor uses the default view sizing policy. */ - public AwContents(AwBrowserContext browserContext, ViewGroup containerView, + public AwContents(AwBrowserContext browserContext, ViewGroup containerView, Context context, InternalAccessDelegate internalAccessAdapter, AwContentsClient contentsClient, AwSettings awSettings) { - this(browserContext, containerView, internalAccessAdapter, contentsClient, awSettings, - new DependencyFactory()); + this(browserContext, containerView, context, internalAccessAdapter, contentsClient, + awSettings, new DependencyFactory()); } /** @@ -479,17 +481,18 @@ public class AwContents { * This version of the constructor is used in test code to inject test versions of the above * documented classes. */ - public AwContents(AwBrowserContext browserContext, ViewGroup containerView, + public AwContents(AwBrowserContext browserContext, ViewGroup containerView, Context context, InternalAccessDelegate internalAccessAdapter, AwContentsClient contentsClient, AwSettings settings, DependencyFactory dependencyFactory) { mBrowserContext = browserContext; mContainerView = containerView; + mContext = context; mInternalAccessAdapter = internalAccessAdapter; mContentsClient = contentsClient; mContentViewClient = new AwContentViewClient(contentsClient, settings); mLayoutSizer = dependencyFactory.createLayoutSizer(); mSettings = settings; - mDIPScale = DeviceDisplayInfo.create(mContainerView.getContext()).getDIPScale(); + mDIPScale = DeviceDisplayInfo.create(mContext).getDIPScale(); mLayoutSizer.setDelegate(new AwLayoutSizerDelegate()); mLayoutSizer.setDIPScale(mDIPScale); mWebContentsDelegate = new AwWebContentsDelegateAdapter(contentsClient, mContainerView); @@ -515,7 +518,7 @@ public class AwContents { mDefaultVideoPosterRequestHandler.getDefaultVideoPosterURL()); mSettings.setDIPScale(mDIPScale); mScrollOffsetManager = dependencyFactory.createScrollOffsetManager( - new AwScrollOffsetManagerDelegate(), new OverScroller(mContainerView.getContext())); + new AwScrollOffsetManagerDelegate(), new OverScroller(mContext)); mScrollAccessibilityHelper = new ScrollAccessibilityHelper(mContainerView); setOverScrollMode(mContainerView.getOverScrollMode()); @@ -529,11 +532,10 @@ public class AwContents { } private static ContentViewCore createAndInitializeContentViewCore(ViewGroup containerView, - InternalAccessDelegate internalDispatcher, long nativeWebContents, + Context context, InternalAccessDelegate internalDispatcher, long nativeWebContents, GestureStateListener gestureStateListener, ContentViewClient contentViewClient, ContentViewCore.ZoomControlsDelegate zoomControlsDelegate) { - Context context = containerView.getContext(); ContentViewCore contentViewCore = new ContentViewCore(context); contentViewCore.initialize(containerView, internalDispatcher, nativeWebContents, context instanceof Activity ? @@ -571,7 +573,7 @@ public class AwContents { long nativeWebContents = nativeGetWebContents(mNativeAwContents); mContentViewCore = createAndInitializeContentViewCore( - mContainerView, mInternalAccessAdapter, nativeWebContents, + mContainerView, mContext, mInternalAccessAdapter, nativeWebContents, new AwGestureStateListener(), mContentViewClient, mZoomControls); nativeSetJavaPeers(mNativeAwContents, this, mWebContentsDelegate, mContentsClientBridge, mIoThreadClient, mInterceptNavigationDelegate); @@ -1001,7 +1003,7 @@ public class AwContents { */ public void setOverScrollMode(int mode) { if (mode != View.OVER_SCROLL_NEVER) { - mOverScrollGlow = new OverScrollGlow(mContainerView); + mOverScrollGlow = new OverScrollGlow(mContext, mContainerView); } else { mOverScrollGlow = null; } @@ -1338,13 +1340,13 @@ public class AwContents { } public String[] getHttpAuthUsernamePassword(String host, String realm) { - return mBrowserContext.getHttpAuthDatabase(mContentViewCore.getContext()) + return mBrowserContext.getHttpAuthDatabase(mContext) .getHttpAuthUsernamePassword(host, realm); } public void setHttpAuthUsernamePassword(String host, String realm, String username, String password) { - mBrowserContext.getHttpAuthDatabase(mContentViewCore.getContext()) + mBrowserContext.getHttpAuthDatabase(mContext) .setHttpAuthUsernamePassword(host, realm, username, password); } @@ -1604,7 +1606,7 @@ public class AwContents { if (mComponentCallbacks != null) return; mComponentCallbacks = new AwComponentCallbacks(); - mContainerView.getContext().registerComponentCallbacks(mComponentCallbacks); + mContext.registerComponentCallbacks(mComponentCallbacks); } /** @@ -1626,7 +1628,7 @@ public class AwContents { updateHardwareAcceleratedFeaturesToggle(); if (mComponentCallbacks != null) { - mContainerView.getContext().unregisterComponentCallbacks(mComponentCallbacks); + mContext.unregisterComponentCallbacks(mComponentCallbacks); mComponentCallbacks = null; } diff --git a/android_webview/java/src/org/chromium/android_webview/OverScrollGlow.java b/android_webview/java/src/org/chromium/android_webview/OverScrollGlow.java index 49c41b6..958da9d 100644 --- a/android_webview/java/src/org/chromium/android_webview/OverScrollGlow.java +++ b/android_webview/java/src/org/chromium/android_webview/OverScrollGlow.java @@ -23,9 +23,8 @@ class OverScrollGlow { private int mOverScrollDeltaX; private int mOverScrollDeltaY; - public OverScrollGlow(View host) { + public OverScrollGlow(Context context, View host) { mHostView = host; - Context context = host.getContext(); mEdgeGlowTop = new EdgeEffect(context); mEdgeGlowBottom = new EdgeEffect(context); mEdgeGlowLeft = new EdgeEffect(context); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java index fd90331..f34ca00 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java @@ -316,8 +316,9 @@ public class AwTestBase AwSettings awSettings = testDependencyFactory.createAwSettings(getActivity(), supportsLegacyQuirks); testContainerView.initialize(new AwContents( - mBrowserContext, testContainerView, testContainerView.getInternalAccessDelegate(), - awContentsClient, awSettings, testDependencyFactory)); + mBrowserContext, testContainerView, testContainerView.getContext(), + testContainerView.getInternalAccessDelegate(), awContentsClient, awSettings, + testDependencyFactory)); return testContainerView; } diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java index a30a72d..5a5c882 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java @@ -130,7 +130,7 @@ public class AwShellActivity extends Activity { final AwSettings awSettings = new AwSettings(this /*context*/, false /*isAccessFromFileURLsGrantedByDefault*/, true /*supportsLegacyQuirks*/); testContainerView.initialize(new AwContents(mBrowserContext, testContainerView, - testContainerView.getInternalAccessDelegate(), + testContainerView.getContext(), testContainerView.getInternalAccessDelegate(), awContentsClient, awSettings)); testContainerView.getAwContents().getSettings().setJavaScriptEnabled(true); if (mDevToolsServer == null) { |