Fix output directory for host tests.

The host tests were being compiled into the target's out directory.
This wasn't causing any problems, but seeing it made me thing there
was something more sinister going on.

Change-Id: Ic2b9317512340e718f5c2648ecb23409dad7dcf9

test/libcxx/android/test/config.py

@@ -14,9 +14,9 @@ class Configuration(libcxx.test.config.Configuration):
 
     def configure(self):
         self.configure_src_root()
+        self.configure_build_cmds()
         self.configure_obj_root()
 
-        self.configure_build_cmds()
         self.configure_cxx()
         self.configure_triple()
         self.configure_features()
@@ -31,6 +31,13 @@ class Configuration(libcxx.test.config.Configuration):
         self.lit_config.note('Using available_features: %s' %
                              list(self.config.available_features))
 
+    def configure_obj_root(self):
+        test_config_file = os.path.join(self.build_cmds_dir, 'testconfig.mk')
+        if 'HOST_NATIVE_TEST' in open(test_config_file).read():
+            self.libcxx_obj_root = os.getenv('ANDROID_HOST_OUT')
+        else:
+            self.libcxx_obj_root = os.getenv('ANDROID_PRODUCT_OUT')
+
     def configure_build_cmds(self):
         os.chdir(self.config.android_root)
         self.build_cmds_dir = os.path.join(self.libcxx_src_root, 'buildcmds')

test/lit.site.cfg

@@ -3,7 +3,6 @@ import os
 config.configuration_variant = 'libcxx.android'
 config.android_root = os.getenv('ANDROID_BUILD_TOP')
 config.libcxx_src_root = os.path.join(config.android_root, 'external/libcxx')
-config.libcxx_obj_root = os.getenv('ANDROID_PRODUCT_OUT')
 config.python_executable = '/usr/bin/python'
 
 config.timeout = '300'