Merge "Fixed the run_apache2.py script to use the correct mime.types file." (94cba5b2) · Commits · e / os / android_frameworks_base

tests/DumpRenderTree2/assets/run_apache2.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,8 @@ def main():
		"\""
		directives += " -c \"User ${APACHE_RUN_USER}\""
		directives += " -c \"Group ${APACHE_RUN_GROUP}\""
		directives += " -C \"TypesConfig " + os.path.join("/etc", "mime.types") + "\""
		directives += " -C \"TypesConfig " + \
		os.path.join(android_tree_root, http_conf_path, "mime.types") + "\""
		conf_file_cmd = " -f " + \
		os.path.join(android_tree_root, http_conf_path, "apache2-debian-httpd.conf")