diff options
| author | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 21:35:37 +0000 |
|---|---|---|
| committer | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 21:40:40 +0000 |
| commit | 9a6fb22f348594098cc5a38329454ca19ce45867 (patch) | |
| tree | 682dbc633495c85dba01dfdc210b2c6474f2b93d /build | |
| parent | d531003da4e6f9d6e7624e5eaf4649584314fee3 (diff) | |
| download | chromium_src-9a6fb22f348594098cc5a38329454ca19ce45867.zip chromium_src-9a6fb22f348594098cc5a38329454ca19ce45867.tar.gz chromium_src-9a6fb22f348594098cc5a38329454ca19ce45867.tar.bz2 | |
[Android] Turn heap_profiler_unittests into an apk and reenable them.
heap_profiler_unittests was previously a native executable target.
It turns out that we don't have the harness in place to run native
executable tests reliably on all Android versions due to the PIE
vs non-PIE issue (L vs ICS, see crbug.com/373219).
This caused a revert in crrev.com/416003005.
This change is making heap_profiler_unittests an apk target, following
the same pattern of the other tests we have in the codebase.
This change is also re-adding the tests to the the bot list.
BUG=393964
Review URL: https://codereview.chromium.org/465223005
Cr-Commit-Position: refs/heads/master@{#291197}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/android/pylib/gtest/gtest_config.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 41d44ca..e6d2446 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -769,7 +769,6 @@ '../tools/android/android_tools.gyp:android_tools', '../tools/android/android_tools.gyp:memconsumer', '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', - '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_stripped', '../ui/events/events.gyp:events_unittests', '../ui/ui_unittests.gyp:ui_unittests', # Unit test bundles packaged as an apk. @@ -794,6 +793,7 @@ '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', '../sync/sync.gyp:sync_unit_tests_apk', + '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk', '../ui/events/events.gyp:events_unittests_apk', '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', '../ui/ui_unittests.gyp:ui_unittests_apk', diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py index ebff3bc..ce3aef4 100644 --- a/build/android/pylib/gtest/gtest_config.py +++ b/build/android/pylib/gtest/gtest_config.py @@ -7,6 +7,7 @@ # Add new suites here before upgrading them to the stable list below. EXPERIMENTAL_TEST_SUITES = [ 'content_gl_tests', + 'heap_profiler_unittests', ] # Do not modify this list without approval of an android owner. |