Revert of [NaCl SDK] Remove support for bionic toolchain

native_client_sdk/src/tools/common.mk

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #
 # GNU Make based build file.  For details on GNU Make see:
 #   http://www.gnu.org/software/make/manual/make.html
 #
 
 #
 # Toolchain
 #
 # By default the VALID_TOOLCHAINS list contains pnacl, clang-newlib and glibc.
 # If your project only builds in one or the other then this should be overridden
 # accordingly.
 #
+ifneq ($(ENABLE_BIONIC),)
+ALL_TOOLCHAINS ?= pnacl glibc clang-newlib bionic
+else
 ALL_TOOLCHAINS ?= pnacl glibc clang-newlib
+endif
 
 VALID_TOOLCHAINS ?= $(ALL_TOOLCHAINS)
 TOOLCHAIN ?= $(word 1,$(VALID_TOOLCHAINS))
 
 #
 # Top Make file, which we want to trigger a rebuild on if it changes
 #
 TOP_MAKE := $(word 1,$(MAKEFILE_LIST))
 
 
@@ skipping 389 matching lines @@
 # macros and targets.
 #
 ifneq (,$(findstring $(TOOLCHAIN),linux mac))
 include $(NACL_SDK_ROOT)/tools/host_gcc.mk
 endif
 
 ifneq (,$(findstring $(TOOLCHAIN),win))
 include $(NACL_SDK_ROOT)/tools/host_vc.mk
 endif
 
-ifneq (,$(findstring $(TOOLCHAIN),glibc clang-newlib))
+ifneq (,$(findstring $(TOOLCHAIN),glibc bionic clang-newlib))
 include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk
 endif
 
 ifneq (,$(findstring $(TOOLCHAIN),pnacl))
 include $(NACL_SDK_ROOT)/tools/nacl_llvm.mk
 endif
 
 #
 # File to redirect to to in order to hide output.
 #
@@ skipping 95 matching lines @@
 # uppercase aliases (for backward compatibility)
 .PHONY: CHECK_FOR_CHROME DEBUG LAUNCH RUN
 CHECK_FOR_CHROME: check_for_chrome
 DEBUG: debug
 LAUNCH: run
 RUN: run
 
 endif  # TOOLCHAIN is valid...
 
 endif  # TOOLCHAIN=all