diff --git a/.gitignore b/.gitignore index 711f09e06..7c4c69f67 100644 --- a/.gitignore +++ b/.gitignore @@ -16,19 +16,27 @@ pin-log.txt /out /sde-avx-sse-transition-out.txt /testing +/third_party/accessibility_test_framework /third_party/android_platform /third_party/android_tools +/third_party/apache_velocity /third_party/appurify-python /third_party/asan /third_party/ashmem /third_party/binutils +/third_party/bouncycastle /third_party/BUILD.gn /third_party/catapult +/third_party/closure_compiler /third_party/drmemory /third_party/gflags/src +/third_party/guava +/third_party/hamcrest /third_party/icu +/third_party/icu4j /third_party/ijar /third_party/instrumented_libraries +/third_party/intellij /third_party/jsr-305 /third_party/junit /third_party/libjpeg @@ -39,9 +47,11 @@ pin-log.txt /third_party/lss /third_party/mockito /third_party/modp_b64 +/third_party/ow2_asm /third_party/protobuf /third_party/requests /third_party/robolectric +/third_party/sqlite4java /third_party/WebKit /third_party/yasm /tools/android diff --git a/DEPS b/DEPS index 03bcbda99..aa00687f2 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { # Roll the Chromium Git hash to pick up newer versions of all the # dependencies and tools linked to in setup_links.py. - 'chromium_revision': '086802955ffbe67f0a2de987822ae8d18dd5353d', + 'chromium_revision': '33f87688e4d164cf8f2ada5b4d01a04468807a11', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 6d3aa1ebc..7a7e74158 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -13,3 +13,6 @@ # remove this when Chromium drops 10.6 support and also requires 10.7. mac_sdk_min_build_override = "10.11" mac_deployment_target_build_override = "10.7" + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = true diff --git a/docs/getting_started.md b/docs/getting_started.md index 7cd56167f..18a7d4297 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -138,29 +138,29 @@ Add to .gclient last line: `target_os=['android'];` armv7 GYP_DEFINES="OS=android" GYP_CROSSCOMPILE=1 ./gyp_libyuv - ninja -j7 -C out/Debug libyuv_unittest_apk - ninja -j7 -C out/Release libyuv_unittest_apk + ninja -j7 -C out/Debug yuv_unittest_apk + ninja -j7 -C out/Release yuv_unittest_apk arm64 GYP_DEFINES="OS=android target_arch=arm64 target_subarch=arm64" GYP_CROSSCOMPILE=1 ./gyp_libyuv - ninja -j7 -C out/Debug libyuv_unittest_apk - ninja -j7 -C out/Release libyuv_unittest_apk + ninja -j7 -C out/Debug yuv_unittest_apk + ninja -j7 -C out/Release yuv_unittest_apk ia32 GYP_DEFINES="OS=android target_arch=ia32" GYP_CROSSCOMPILE=1 ./gyp_libyuv - ninja -j7 -C out/Debug libyuv_unittest_apk - ninja -j7 -C out/Release libyuv_unittest_apk + ninja -j7 -C out/Debug yuv_unittest_apk + ninja -j7 -C out/Release yuv_unittest_apk GYP_DEFINES="OS=android target_arch=ia32 android_full_debug=1" GYP_CROSSCOMPILE=1 ./gyp_libyuv - ninja -j7 -C out/Debug libyuv_unittest_apk + ninja -j7 -C out/Debug yuv_unittest_apk mipsel GYP_DEFINES="OS=android target_arch=mipsel" GYP_CROSSCOMPILE=1 ./gyp_libyuv - ninja -j7 -C out/Debug libyuv_unittest_apk - ninja -j7 -C out/Release libyuv_unittest_apk + ninja -j7 -C out/Debug yuv_unittest_apk + ninja -j7 -C out/Release yuv_unittest_apk arm32 disassembly: diff --git a/libyuv.gyp b/libyuv.gyp index 3c84c8711..abd012ac6 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -32,10 +32,6 @@ and (arm_neon == 1 or arm_neon_optional == 1)', { 'build_neon': 1, }], - ['OS=="android" and target_arch=="mipsel"', { - # Linking fails with the gold linker: bugs.webrtc.org/5977. - 'linux_use_bundled_gold%': 0, - }], ], }, diff --git a/libyuv_test.gyp b/libyuv_test.gyp index 27b330f65..6994b6e6f 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -181,40 +181,16 @@ ['OS=="android"', { 'targets': [ { - # TODO(kjellander): Figure out what to change in build/apk_test.gypi - # to it can be used instead of the copied code below. Using it in its - # current version was not possible, since the target starts with 'lib', - # which somewhere confuses the variables. - 'target_name': 'libyuv_unittest_apk', + 'target_name': 'yuv_unittest_apk', 'type': 'none', 'variables': { - # These are used to configure java_apk.gypi included below. - 'test_type': 'gtest', - 'apk_name': 'libyuv_unittest', - 'test_suite_name': 'libyuv_unittest', - 'intermediate_dir': '<(PRODUCT_DIR)/libyuv_unittest_apk', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)libyuv_unittest<(SHARED_LIB_SUFFIX)', - 'final_apk_path': '<(intermediate_dir)/libyuv_unittest-debug.apk', - 'java_in_dir': '<(DEPTH)/testing/android/native_test/java', - 'test_runner_path': '<(DEPTH)/util/android/test_runner.py', - 'native_lib_target': 'libyuv_unittest', - 'gyp_managed_install': 0, + 'test_suite_name': 'yuv_unittest', + 'input_shlib_path': '<(SHARED_LIB_DIR)/(SHARED_LIB_PREFIX)libyuv_unittest<(SHARED_LIB_SUFFIX)', }, 'includes': [ - 'build/android/test_runner.gypi', - 'build/java_apk.gypi', - ], + 'build/apk_test.gypi', + ], 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_java', - # TODO(kjellander): Figure out why base_build_config_gen is needed - # here. It really shouldn't since it's a dependency of base_java - # above, but there's always 0 tests run if it's missing. - '<(DEPTH)/base/base.gyp:base_build_config_gen', - '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands', - '<(DEPTH)/build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk', - '<(DEPTH)/testing/android/appurify_support.gyp:appurify_support_java', - '<(DEPTH)/testing/android/on_device_instrumentation.gyp:reporter_java', - '<(DEPTH)/tools/android/android_tools.gyp:android_tools', 'libyuv_unittest', ], }, diff --git a/setup_links.py b/setup_links.py index b2b459e60..81d74be85 100755 --- a/setup_links.py +++ b/setup_links.py @@ -63,21 +63,31 @@ target_os = get_target_os_list() if 'android' in target_os: DIRECTORIES += [ 'base', + 'third_party/accessibility_test_framework', 'third_party/android_platform', 'third_party/android_tools', + 'third_party/apache_velocity', 'third_party/appurify-python', 'third_party/ashmem', + 'third_party/bouncycastle', 'third_party/catapult', + 'third_party/closure_compiler', + 'third_party/guava', + 'third_party/hamcrest', 'third_party/icu', + 'third_party/icu4j', 'third_party/ijar', + 'third_party/intellij', 'third_party/jsr-305', 'third_party/junit', 'third_party/libxml', 'third_party/mockito', 'third_party/modp_b64', + 'third_party/ow2_asm', 'third_party/protobuf', 'third_party/requests', 'third_party/robolectric', + 'third_party/sqlite4java', 'tools/android', 'tools/grit', ]