Merge "Revert "Add sdk mutator for native modules"" (d66b1210) · Commits · e / os / android_build_soong

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,6 @@ bootstrap_go_package {
		"cc/rs.go",
		"cc/sanitize.go",
		"cc/sabi.go",
		"cc/sdk.go",
		"cc/snapshot_utils.go",
		"cc/stl.go",
		"cc/strip.go",

android/neverallow.go

+0 −44

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ func init() {
		AddNeverAllowRules(createLibcoreRules()...)
		AddNeverAllowRules(createMediaRules()...)
		AddNeverAllowRules(createJavaDeviceForHostRules()...)
		AddNeverAllowRules(createCcSdkVariantRules()...)
		}

		// Add a NeverAllow rule to the set of rules to apply.
		@@ -176,37 +175,6 @@ func createJavaDeviceForHostRules() []Rule {
		}
		}

		func createCcSdkVariantRules() []Rule {
		sdkVersionOnlyWhitelist := []string{
		// derive_sdk_prefer32 has stem: "derive_sdk" which conflicts with the derive_sdk.
		// This sometimes works because the APEX modules that contain derive_sdk and
		// derive_sdk_prefer32 suppress the platform installation rules, but fails when
		// the APEX modules contain the SDK variant and the platform variant still exists.
		"frameworks/base/apex/sdkextensions/derive_sdk",
		}

		platformVariantPropertiesWhitelist := []string{
		// android_native_app_glue and libRSSupport use native_window.h but target old
		// sdk versions (minimum and 9 respectively) where libnativewindow didn't exist,
		// so they can't add libnativewindow to shared_libs to get the header directory
		// for the platform variant. Allow them to use the platform variant
		// property to set shared_libs.
		"prebuilts/ndk",
		"frameworks/rs",
		}

		return []Rule{
		NeverAllow().
		NotIn(sdkVersionOnlyWhitelist...).
		WithMatcher("sdk_variant_only", isSetMatcherInstance).
		Because("sdk_variant_only can only be used in whitelisted projects"),
		NeverAllow().
		NotIn(platformVariantPropertiesWhitelist...).
		WithMatcher("platform.shared_libs", isSetMatcherInstance).
		Because("platform variant properties can only be used in whitelisted projects"),
		}
		}

		func neverallowMutator(ctx BottomUpMutatorContext) {
		m, ok := ctx.Module().(Module)
		if !ok {
		@@ -286,18 +254,6 @@ func (m *startsWithMatcher) String() string {
		return ".starts-with(" + m.prefix + ")"
		}

		type isSetMatcher struct{}

		func (m *isSetMatcher) test(value string) bool {
		return value != ""
		}

		func (m *isSetMatcher) String() string {
		return ".is-set"
		}

		var isSetMatcherInstance = &isSetMatcher{}

		type ruleProperty struct {
		fields []string // e.x.: Vndk.Enabled
		matcher ValueMatcher

android/neverallow_test.go

+0 −50

Original line number	Diff line number	Diff line
		@@ -249,50 +249,6 @@ var neverallowTests = []struct {
		}`),
		},
		},
		// CC sdk rule tests
		{
		name: `"sdk_variant_only" outside whitelist`,
		fs: map[string][]byte{
		"Android.bp": []byte(`
		cc_library {
		name: "outside_whitelist",
		sdk_version: "current",
		sdk_variant_only: true,
		}`),
		},
		expectedErrors: []string{
		`module "outside_whitelist": violates neverallow`,
		},
		},
		{
		name: `"sdk_variant_only: false" outside whitelist`,
		fs: map[string][]byte{
		"Android.bp": []byte(`
		cc_library {
		name: "outside_whitelist",
		sdk_version: "current",
		sdk_variant_only: false,
		}`),
		},
		expectedErrors: []string{
		`module "outside_whitelist": violates neverallow`,
		},
		},
		{
		name: `"platform" outside whitelist`,
		fs: map[string][]byte{
		"Android.bp": []byte(`
		cc_library {
		name: "outside_whitelist",
		platform: {
		shared_libs: ["libfoo"],
		},
		}`),
		},
		expectedErrors: []string{
		`module "outside_whitelist": violates neverallow`,
		},
		},
		}

		func TestNeverallow(t *testing.T) {
		@@ -333,8 +289,6 @@ type mockCcLibraryProperties struct {
		Include_dirs []string
		Vendor_available *bool
		Static_libs []string
		Sdk_version *string
		Sdk_variant_only *bool

		Vndk struct {
		Enabled *bool
		@@ -351,10 +305,6 @@ type mockCcLibraryProperties struct {
		Cflags []string
		}
		}

		Platform struct {
		Shared_libs []string
		}
		}

		type mockCcLibraryModule struct {

apex/apex_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -3384,7 +3384,7 @@ func TestApexWithApps(t *testing.T) {
		}
		// JNI libraries including transitive deps are
		for _, jni := range []string{"libjni", "libfoo"} {
		jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_myapex").Module().(*cc.Module).OutputFile()
		jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_shared_myapex").Module().(*cc.Module).OutputFile()
		// ... embedded inside APK (jnilibs.zip)
		ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())
		// ... and not directly inside the APEX

apex/vndk_test.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
		system_shared_libs: [],
		stl: "none",
		notice: "custom_notice",
		sdk_version: "current",
		}
		cc_library {
		name: "libprofile-clang-extras_ndk",
		@@ -99,7 +98,6 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
		system_shared_libs: [],
		stl: "none",
		notice: "custom_notice",
		sdk_version: "current",
		}
		`, func(fs map[string][]byte, config android.Config) {
		config.TestProductVariables.Native_coverage = proptools.BoolPtr(true)