StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main am: 56aed2b0e8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3251042

Change-Id: Ib543856a377c18f68a8bb5cad585bc787b04e5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2024-09-04 18:33:08 +00:00
committed by Automerger Merge Worker
parent 79a09ae64c 56aed2b0e8
commit 092389231f
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/neverallow.go
View File

@@ -60,6 +60,7 @@ func init() {
AddNeverAllowRules(createCcStubsRule()) AddNeverAllowRules(createCcStubsRule())
AddNeverAllowRules(createJavaExcludeStaticLibsRule()) AddNeverAllowRules(createJavaExcludeStaticLibsRule())
AddNeverAllowRules(createProhibitHeaderOnlyRule()) AddNeverAllowRules(createProhibitHeaderOnlyRule())
AddNeverAllowRules(createLimitNdkExportRule()...)
} }
// Add a NeverAllow rule to the set of rules to apply. // Add a NeverAllow rule to the set of rules to apply.
@@ -267,6 +268,22 @@ func createProhibitHeaderOnlyRule() Rule {
Because("headers_only can only be used for generating framework-minus-apex headers for non-updatable modules") Because("headers_only can only be used for generating framework-minus-apex headers for non-updatable modules")
} }
func createLimitNdkExportRule() []Rule {
reason := "If the headers you're trying to export are meant to be a part of the NDK, they should be exposed by an ndk_headers module. If the headers shouldn't be a part of the NDK, the headers should instead be exposed from a separate `cc_library_headers` which consumers depend on."
// DO NOT ADD HERE - please consult danalbert@
// b/357711733
return []Rule{
NeverAllow().
NotIn("frameworks/native/libs/binder/ndk").
ModuleType("ndk_library").
WithMatcher("export_header_libs", isSetMatcherInstance).Because(reason),
NeverAllow().ModuleType("ndk_library").WithMatcher("export_generated_headers", isSetMatcherInstance).Because(reason),
NeverAllow().ModuleType("ndk_library").WithMatcher("export_include_dirs", isSetMatcherInstance).Because(reason),
NeverAllow().ModuleType("ndk_library").WithMatcher("export_shared_lib_headers", isSetMatcherInstance).Because(reason),
NeverAllow().ModuleType("ndk_library").WithMatcher("export_static_lib_headers", isSetMatcherInstance).Because(reason),
}
}
func neverallowMutator(ctx BottomUpMutatorContext) { func neverallowMutator(ctx BottomUpMutatorContext) {
m, ok := ctx.Module().(Module) m, ok := ctx.Module().(Module)
if !ok { if !ok {