1. 11 Jul, 2016 1 commit
    • Colin Cross's avatar
      Rename Android.soong.mk to Android.mk · 7f0e89fa
      Colin Cross authored
      Soong is always on now, so we don't have to distinguish between
      makefiles that should be ignored because Soong is handling them with an
      Android.bp file, and makefiles that are still needed with Soong.  All
      obsolete Android.mk files have been removed, rename all Android.soong.mk
      files to Android.mk.
      
      Change-Id: Ic0494e1800dec13a9f5714559cffe3a5ebe49418
      7f0e89fa
  2. 16 May, 2016 1 commit
    • Colin Cross's avatar
      Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs · acf2c26b
      Colin Cross authored
      When building with soong Android.mk files are ignored in directories
      that have Android.bp files.  Only parts of bionic have been converted to
      Android.bp files, including some directories that have subdirectories
      with Android.mk files.
      
      Add Android.soong.mk files to include subdirectories to any directory
      that has an Android.bp file but also has subdirectories with only
      Android.mk files.
      
      Change-Id: Ibd3c27d51c44f7a4b42dad0bc747e357b4ae34ca
      acf2c26b