Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e4a3fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "no_whitelisting_apex_available" 

* changes:
  Remove some apex_available whitelist for the adbd APEX
  Make ndk_prebuilt_* be available to any apex
parents ab768cf5 3a0db5ef

apex/apex.go

+0 −24
Original line number Diff line number Diff line
@@ -94,16 +94,9 @@ func makeApexAvailableWhitelist() map[string][]string { 
	// Module separator

	//

	m["com.android.adbd"] = []string{

		"adbd",

		"libadbconnection_server",

		"libadbd",

		"libadbd_auth",

		"libadbd_core",

		"libadbd_services",

		"libasyncio",

		"libbuildversion",

		"libcap",

		"libdiagnose_usb",

		"libmdnssd",

		"libminijail",

		"libminijail_gen_constants",
@@ -114,7 +107,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libpackagelistparser",

		"libpcre2",

		"libprocessgroup_headers",

		"libqemu_pipe",

	}

	//

	// Module separator
@@ -819,22 +811,6 @@ func makeApexAvailableWhitelist() map[string][]string { 
		"libprofile-extras",

		"libprofile-extras_ndk",

		"libunwind_llvm",

		"ndk_crtbegin_dynamic.27",

		"ndk_crtbegin_so.16",

		"ndk_crtbegin_so.19",

		"ndk_crtbegin_so.21",

		"ndk_crtbegin_so.24",

		"ndk_crtbegin_so.27",

		"ndk_crtend_android.27",

		"ndk_crtend_so.16",

		"ndk_crtend_so.19",

		"ndk_crtend_so.21",

		"ndk_crtend_so.24",

		"ndk_crtend_so.27",

		"ndk_libandroid_support",

		"ndk_libc++_static",

		"ndk_libc++abi",

		"ndk_libunwind",

	}

	return m

}

cc/ndk_prebuilt.go

+10 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ func (c *ndkPrebuiltObjectLinker) link(ctx ModuleContext, flags Flags, 
	return ndkPrebuiltModuleToPath(ctx, flags.Toolchain, objectExtension, ctx.sdkVersion())

}



func (*ndkPrebuiltObjectLinker) availableFor(what string) bool {

	// ndk prebuilt objects are available to everywhere

	return true

}



type ndkPrebuiltStlLinker struct {

	*libraryDecorator

}
@@ -103,6 +108,11 @@ func (*ndkPrebuiltStlLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 
	return deps

}



func (*ndkPrebuiltStlLinker) availableFor(what string) bool {

	// ndk prebuilt objects are available to everywhere

	return true

}



// ndk_prebuilt_shared_stl exports a precompiled ndk shared standard template

// library (stl) library for linking operation. The soong's module name format

// is ndk_<NAME>.so where the library is located under