tree 486a45d54e4e13d1e1826c92141851150c177b80
parent d815dbd1343d05aae5f5430dc38d8846107d202b
parent 1e4adfa837c77dc2dcb73ce2c0b32bf362e80000
author Bill Yi <byi@google.com> 1398818963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398818963 +0000

am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD

* commit '1e4adfa837c77dc2dcb73ce2c0b32bf362e80000':
  Try to catch more misuse of $(my-dir).
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures