Allow for setting a logging_parent for an Apex.

Test: go test ./... -test.v -run TestOverrideApex
BUG: 148198056
Change-Id: Ib3749e59f5e31903f2dbe75f86534738147a55ec
This commit is contained in:
Baligh Uddin 2020-02-19 21:29:28 -08:00
parent a0d58893fc
commit 004d717158
3 changed files with 12 additions and 0 deletions

View file

@ -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

View file

@ -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)

View file

@ -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.