pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

When building with soong Android.mk files are ignored in directories
that have Android.bp files.  Only parts of bionic have been converted to
Android.bp files, including some directories that have subdirectories
with Android.mk files.

Add Android.soong.mk files to include subdirectories to any directory
that has an Android.bp file but also has subdirectories with only
Android.mk files.

Change-Id: Ibd3c27d51c44f7a4b42dad0bc747e357b4ae34ca
This commit is contained in:
Colin Cross 2016-05-16 16:55:08 -07:00
parent e79b630daa
commit acf2c26bf6
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) LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH)) \ include $(call all-makefiles-under,$(LOCAL_PATH))
$(call all-makefiles-under,$(LOCAL_PATH)/libc)

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_SANITIZE := never
LOCAL_NATIVE_COVERAGE := $(bionic_coverage) LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
include $(BUILD_STATIC_LIBRARY) 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))