resolve merge conflicts of e4f77886611d1b4f8b5018dc6d4cc027da0a77a6 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496  -s ours am: 3288f0cabb  -s ours am: 7a5397dd65  -s ours
am: 23aff09c6f  -s ours

Change-Id: Ic30a5d1a95ee3eeb1143ecfafba9d91fa43c1bf1
tree: 8809fbfef9d44244b7e36cbc86f5f2124f198e82
  1. core/
  2. target/
  3. tests/
  4. tools/
  5. .gitignore
  6. Android.mk
  7. buildspec.mk.default
  8. Changes.md
  9. CleanSpec.mk
  10. envsetup.sh
  11. help.sh
  12. navbar.md
  13. OWNERS
  14. README.md
  15. tapasHelp.sh
  16. Usage.txt
README.md

Android Make Build System

This is the Makefile-based portion of the Android Build System.

For documentation on how to run a build, see Usage.txt

For a list of behavioral changes useful for Android.mk writers see Changes.md

For an outdated reference on Android.mk files, see build-system.html. Our Android.mk files look similar, but are entirely different from the Android.mk files used by the NDK build system. When searching for documentation elsewhere, ensure that it is for the platform build system -- most are not.

This Makefile-based system is in the process of being replaced with Soong, a new build system written in Go. During the transition, all of these makefiles are read by Kati, and generate a ninja file instead of being executed directly. That's combined with a ninja file read by Soong so that the build graph of the two systems can be combined and run as one.