commit 2487f3e15f19cd370f2e45b466c577cbb4db23f8
author Colin Cross <ccross@android.com> Wed Jan 13 20:32:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 13 20:32:09 2016 +0000
tree 68ad924a6151db3404207ef8b299a4c0e053eb84
parent 5d10e69bea2381317c70861cf9984275906c81b4
parent c23aeb8414176a0d8dd0cc36f9a5a1907e233a0c

Merge "Rearrange build files to support USE_SOONG=true"

Android.bp

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index b44c296..0000000
--- a/Android.bp
+++ /dev/null
@@ -1 +0,0 @@
-subdirs = ["*"]

Android.mk

diff --git a/Android.mk b/Android.mk
index 7c39751..9f0f0c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,4 +16,5 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under,$(LOCAL_PATH)) \
+	$(call all-makefiles-under,$(LOCAL_PATH)/libc)

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 753e946..39c8c9e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1629,6 +1629,3 @@
 LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 include $(BUILD_STATIC_LIBRARY)
 
-
-# ========================================================
-include $(call all-makefiles-under,$(LOCAL_PATH))