tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use Android.soong.mk to handle mixed Android.mk and Android.bp dirs"

Browse source
This commit is contained in:
Colin Cross 2016-05-17 00:42:17 +00:00 committed by Gerrit Code Review
commit 79d0281456
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.bp Normal file
View file

@ -0,0 +1,2 @@
subdirs = ["*"]

3
Android.mk
View file

@ -16,5 +16,4 @@
LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH)) \
$(call all-makefiles-under,$(LOCAL_PATH)/libc)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
Android.soong.mk Normal file
View file

@ -0,0 +1,4 @@
LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH))

2
libc/Android.mk
View file

@ -1477,3 +1477,5 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_SANITIZE := never
LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
include $(BUILD_STATIC_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
libc/Android.soong.mk Normal file
View file

@ -0,0 +1,4 @@
LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH))