diff options
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/BUILD.gn | 27 | ||||
| -rw-r--r-- | sandbox/linux/sandbox_linux.gypi | 29 |
2 files changed, 1 insertions, 55 deletions
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn index f92db8f..697839b 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn @@ -77,7 +77,7 @@ source_set("sandbox_linux_test_utils") { } } -# Sources shared by sandbox_linux_unittests and sandbox_linux_jni_unittests. +# Sources for sandbox_linux_unittests. source_set("sandbox_linux_unittests_sources") { testonly = true @@ -204,19 +204,6 @@ test("sandbox_linux_unittests") { ] } -# This target is the shared library used by Android APK (i.e. -# JNI-friendly) tests. -shared_library("sandbox_linux_jni_unittests") { - testonly = true - deps = [ - ":sandbox_linux_unittests_sources", - "//build/config/sanitizers:deps", - ] - if (is_android) { - deps += [ "//testing/android/native_test:native_test_native_code" ] - } -} - component("seccomp_bpf") { sources = [ "bpf_dsl/bpf_dsl.cc", @@ -463,16 +450,4 @@ if (is_android) { # ":sandbox_linux_unittests", # ] #} - # TODO(GYP) convert this. - # { - # 'target_name': 'sandbox_linux_jni_unittests_apk', - # 'type': 'none', - # 'variables': { - # 'test_suite_name': 'sandbox_linux_jni_unittests', - # }, - # 'dependencies': [ - # 'sandbox_linux_jni_unittests', - # ], - # 'includes': [ '../../build/apk_test.gypi' ], - # } } diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi index 60f724f..f5b3e0f 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -120,22 +120,6 @@ ] }, { - # This target is the shared library used by Android APK (i.e. - # JNI-friendly) tests. - 'target_name': 'sandbox_linux_jni_unittests', - 'includes': [ - 'sandbox_linux_test_sources.gypi', - ], - 'type': 'shared_library', - 'conditions': [ - [ 'OS == "android"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, - { 'target_name': 'seccomp_bpf', 'type': '<(component)', 'sources': [ @@ -422,19 +406,6 @@ }], }], [ 'OS=="android"', { - 'targets': [ - { - 'target_name': 'sandbox_linux_jni_unittests_apk', - 'type': 'none', - 'variables': { - 'test_suite_name': 'sandbox_linux_jni_unittests', - }, - 'dependencies': [ - 'sandbox_linux_jni_unittests', - ], - 'includes': [ '../../build/apk_test.gypi' ], - } - ], 'conditions': [ ['test_isolation_mode != "noop"', { 'targets': [ |