Allow for setting a logging_parent for an Apex. am: 004d717158 (f4fa3fe8) · Commits · e / os / android_build_soong

apex/apex.go

+3 −0

Original line number	Diff line number	Diff line
		@@ -1316,6 +1316,9 @@ type overridableProperties struct {
		// binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will be removed
		// from PRODUCT_PACKAGES.
		Overrides []string

		// Logging Parent value
		Logging_parent string
		}

		type apexPackaging int

+5 −0

Original line number	Diff line number	Diff line
		@@ -3230,6 +3230,7 @@ func TestOverrideApex(t *testing.T) {
		base: "myapex",
		apps: ["override_app"],
		overrides: ["unknownapex"],
		logging_parent: "com.foo.bar",
		}

		apex_key {
		@@ -3276,6 +3277,10 @@ func TestOverrideApex(t *testing.T) {
		t.Errorf("name should be \"override_myapex\", but was %q", name)
		}

		if apexBundle.overridableProperties.Logging_parent != "com.foo.bar" {
		t.Errorf("override_myapex should have logging parent (com.foo.bar), but was %q.", apexBundle.overridableProperties.Logging_parent)
		}

		data := android.AndroidMkDataForTest(t, config, "", apexBundle)
		var builder strings.Builder
		data.Custom(&builder, name, "TARGET_", "", data)

+4 −0

Original line number	Diff line number	Diff line
		@@ -394,6 +394,10 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
		optFlags = append(optFlags, "--target_sdk_version "+targetSdkVersion)
		optFlags = append(optFlags, "--min_sdk_version "+minSdkVersion)

		if a.overridableProperties.Logging_parent != "" {
		optFlags = append(optFlags, "--logging_parent ", a.overridableProperties.Logging_parent)
		}

		a.mergedNotices = a.buildNoticeFiles(ctx, a.Name()+suffix)
		if a.mergedNotices.HtmlGzOutput.Valid() {
		// If there's a NOTICE file, embed it as an asset file in the APEX.