Merge "Ignore Android.mk files for NDK build in external/" into main (eea4f417) · Commits · e / os / android_build_soong

ui/build/androidmk_denylist.go

+28 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ package build

		import (
		"strings"

		"android/soong/android"
		)

		var androidmk_denylist []string = []string{
		@@ -64,3 +66,29 @@ func blockAndroidMks(ctx Context, androidMks []string) {
		}
		}
		}

		// The Android.mk files in these directories are for NDK build system.
		var external_ndk_androidmks []string = []string{
		"external/fmtlib/",
		"external/google-breakpad/",
		"external/googletest/",
		"external/libaom/",
		"external/libusb/",
		"external/libvpx/",
		"external/libwebm/",
		"external/libwebsockets/",
		"external/vulkan-validation-layers/",
		"external/walt/",
		"external/webp/",
		}

		func ignoreNdkAndroidMks(androidMks []string) []string {
		return android.FilterListPred(androidMks, func(s string) bool {
		for _, d := range external_ndk_androidmks {
		if strings.HasPrefix(s, d) {
		return false
		}
		}
		return true
		})
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ func FindSources(ctx Context, config Config, f *finder.Finder) {

		// Stop searching a subdirectory recursively after finding an Android.mk.
		androidMks := f.FindFirstNamedAt(".", "Android.mk")
		androidMks = ignoreNdkAndroidMks(androidMks)
		blockAndroidMks(ctx, androidMks)
		err := dumpListToFile(ctx, config, androidMks, filepath.Join(dumpDir, "Android.mk.list"))
		if err != nil {