diff options
| author | 2021-04-06 10:35:10 -0400 | |
|---|---|---|
| committer | 2021-04-07 16:26:55 -0400 | |
| commit | 0c4f71cd9657020b54c79af6388b1b282d7cba68 (patch) | |
| tree | 74161cb6384a5a9c9db67b549e8f8fb06879e3bb | |
| parent | 440b2340818ef99e3cfb77e69cbc73d6bfa1f3ee (diff) | |
Support paths for init_rc from Soong.
The property init_rc accepts paths and references to other modules;
however, none of that is passed onto make, resulting in errors if a
non-local path is used.
Test: m
Bug: 184567830
Change-Id: Idbbf9de66c5182784d055e1cd64bcef34a7dbd79
| -rw-r--r-- | android/androidmk.go | 2 | ||||
| -rw-r--r-- | apex/androidmk.go | 4 | ||||
| -rw-r--r-- | apex/apex_test.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index 93175670f..66a1036a5 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -546,7 +546,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint } if !amod.InRamdisk() && !amod.InVendorRamdisk() { - a.AddStrings("LOCAL_INIT_RC", amod.commonProperties.Init_rc...) + a.AddPaths("LOCAL_FULL_INIT_RC", amod.initRcPaths) } a.AddStrings("LOCAL_VINTF_FRAGMENTS", amod.commonProperties.Vintf_fragments...) a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary)) diff --git a/apex/androidmk.go b/apex/androidmk.go index 99cd75ef1..9fc701d2c 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -284,7 +284,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo // To install companion files (init_rc, vintf_fragments) // Copy some common properties of apexBundle to apex_manifest commonProperties := []string{ - "LOCAL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", + "LOCAL_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", } for _, name := range commonProperties { if value, ok := apexAndroidMkData.Entries.EntryMap[name]; ok { @@ -394,7 +394,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { // Because apex writes .mk with Custom(), we need to write manually some common properties // which are available via data.Entries commonProperties := []string{ - "LOCAL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", + "LOCAL_FULL_INIT_RC", "LOCAL_VINTF_FRAGMENTS", "LOCAL_PROPRIETARY_MODULE", "LOCAL_VENDOR_MODULE", "LOCAL_ODM_MODULE", "LOCAL_PRODUCT_MODULE", "LOCAL_SYSTEM_EXT_MODULE", "LOCAL_MODULE_OWNER", } diff --git a/apex/apex_test.go b/apex/apex_test.go index bdff41e6d..54aead721 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -2745,7 +2745,7 @@ func TestAndroidMkWritesCommonProperties(t *testing.T) { data.Custom(&builder, name, prefix, "", data) androidMk := builder.String() ensureContains(t, androidMk, "LOCAL_VINTF_FRAGMENTS := fragment.xml\n") - ensureContains(t, androidMk, "LOCAL_INIT_RC := init.rc\n") + ensureContains(t, androidMk, "LOCAL_FULL_INIT_RC := init.rc\n") } func TestStaticLinking(t *testing.T) { |