[automerger skipped] resolve merge conflicts of 22ccf36b1ba7cd51e5b76a25f9b028944c1a7703 to rvc-dev am: 63e1c37e6f -s ours am: a64636147a -s ours

am skip reason: Change-Id Ic8a8adb3fffb357754384ddbf13684d944a9767e with SHA-1 f037e1a969 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12612704

Change-Id: Ib8b59dde0d54cfb5ef494925a4a920679b3941a2
tree: 78a433c2bab00f08bb310fa12e759abe28031d12
  1. common/
  2. core/
  3. packaging/
  4. target/
  5. tests/
  6. tools/
  7. .gitignore
  8. buildspec.mk.default
  9. Changes.md
  10. CleanSpec.mk
  11. Deprecation.md
  12. envsetup.sh
  13. help.sh
  14. navbar.md
  15. OWNERS
  16. rbesetup.sh
  17. README.md
  18. tapasHelp.sh
  19. 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.