diff options
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/android/pylib/gtest/gtest_config.py | 1 | ||||
| -rw-r--r-- | tools/android/heap_profiler/heap_profiler.gyp | 19 |
3 files changed, 12 insertions, 10 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. diff --git a/tools/android/heap_profiler/heap_profiler.gyp b/tools/android/heap_profiler/heap_profiler.gyp index f30b823..50e6797 100644 --- a/tools/android/heap_profiler/heap_profiler.gyp +++ b/tools/android/heap_profiler/heap_profiler.gyp @@ -32,25 +32,26 @@ }, { 'target_name': 'heap_profiler_unittests', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'sources': [ 'heap_profiler_unittest.cc' ], 'dependencies': [ 'heap_profiler_core', + '../../../testing/android/native_test.gyp:native_test_native_code', '../../../testing/gtest.gyp:gtest', '../../../testing/gtest.gyp:gtest_main', ], 'include_dirs': [ '../../..' ], }, { - 'target_name': 'heap_profiler_unittests_stripped', + 'target_name': 'heap_profiler_unittests_apk', 'type': 'none', - 'dependencies': [ 'heap_profiler_unittests' ], - 'actions': [{ - 'action_name': 'strip heap_profiler_unittests', - 'inputs': [ '<(PRODUCT_DIR)/heap_profiler_unittests' ], - 'outputs': [ '<(PRODUCT_DIR)/heap_profiler_unittests_stripped' ], - 'action': [ '<(android_strip)', '<@(_inputs)', '-o', '<@(_outputs)' ], - }], + 'dependencies': [ + 'heap_profiler_unittests', + ], + 'variables': { + 'test_suite_name': 'heap_profiler_unittests', + }, + 'includes': [ '../../../build/apk_test.gypi' ], }, { 'target_name': 'heap_profiler_integrationtest', |