StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run InitAndroidArchModule last in factory functions." am: 797b03eec9 am: e3fd959661

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641400

Change-Id: I360027624f4e5773bb2851b53025f3c56f823c36
This commit is contained in:
Treehugger Robot
2021-03-17 12:34:15 +00:00
committed by Automerger Merge Worker
parent 236e3ffac0 e3fd959661
commit 299adde645
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/boot_image.go
View File

@@ -20,6 +20,7 @@ import (
"android/soong/android"
"android/soong/dexpreopt"
"github.com/google/blueprint"
)
@@ -56,9 +57,9 @@ type BootImageModule struct {
func bootImageFactory() android.Module {
m := &BootImageModule{}
m.AddProperties(&m.properties)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitApexModule(m)
android.InitSdkAwareModule(m)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
return m
}
@@ -210,11 +211,11 @@ func (module *prebuiltBootImageModule) Name() string {
func prebuiltBootImageFactory() android.Module {
m := &prebuiltBootImageModule{}
m.AddProperties(&m.properties)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
// This doesn't actually have any prebuilt files of its own so pass a placeholder for the srcs
// array.
android.InitPrebuiltModule(m, &[]string{"placeholder"})
android.InitApexModule(m)
android.InitSdkAwareModule(m)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
return m
}