diff options
| author | 2015-07-30 16:46:31 +0000 | |
|---|---|---|
| committer | 2015-07-30 16:46:31 +0000 | |
| commit | 5d2ed003020feee437683b84e4ea6b8c6a5753e0 (patch) | |
| tree | 2d0b0d40d452b47da6428d65555d53afe4774441 /compiler/optimizing | |
| parent | a302e9133b659d9b96066aa53f9d22d35d2dba13 (diff) | |
| parent | c60e1b755c5632dfeb04c333489ede52ee5c945f (diff) | |
Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/optimizing_cfi_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index fe3bb1a2b4..f455571636 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -29,7 +29,7 @@ namespace art { // Run the tests only on host. -#ifndef HAVE_ANDROID_OS +#ifndef __ANDROID__ class OptimizingCFITest : public CFITest { public: @@ -125,6 +125,6 @@ TEST_ISA(kArm64) TEST_ISA(kX86) TEST_ISA(kX86_64) -#endif // HAVE_ANDROID_OS +#endif // __ANDROID__ } // namespace art |