diff options
| -rw-r--r-- | components/nacl/browser/nacl_browser.cc | 3 | ||||
| -rw-r--r-- | ppapi/native_client/chrome_main.scons | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/components/nacl/browser/nacl_browser.cc b/components/nacl/browser/nacl_browser.cc index b6a14fe..73e978c 100644 --- a/components/nacl/browser/nacl_browser.cc +++ b/components/nacl/browser/nacl_browser.cc @@ -61,9 +61,6 @@ const base::FilePath::StringType NaClIrtName() { irt_name.append(FILE_PATH_LITERAL("x86_32")); #elif defined(ARCH_CPU_ARMEL) - // TODO(mcgrathr): Eventually we'll need to distinguish arm32 vs thumb2. - // That may need to be based on the actual nexe rather than a static - // choice, which would require substantial refactoring. irt_name.append(FILE_PATH_LITERAL("arm")); #elif defined(ARCH_CPU_MIPSEL) irt_name.append(FILE_PATH_LITERAL("mips32")); diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons index 3c4168c..fd2616e 100644 --- a/ppapi/native_client/chrome_main.scons +++ b/ppapi/native_client/chrome_main.scons @@ -416,11 +416,6 @@ def PPAPIBrowserTester(env, if 'TRUSTED_ENV' not in env: return [] - # No browser tests run on arm-thumb2 - # Bug http://code.google.com/p/nativeclient/issues/detail?id=2224 - if env.Bit('target_arm_thumb2'): - return [] - # Handle issues with mutating any python default arg lists. if browser_flags is None: browser_flags = [] @@ -544,8 +539,7 @@ pre_base_env.AddMethod(PPAPIBrowserTester) # Disabled for ARM and MIPS because Chrome binaries for ARM and MIPS are not # available. def PPAPIBrowserTesterIsBroken(env): - return (env.Bit('target_arm') or env.Bit('target_arm_thumb2') - or env.Bit('target_mips32')) + return env.Bit('target_arm') or env.Bit('target_mips32') pre_base_env.AddMethod(PPAPIBrowserTesterIsBroken) |