tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I6aa28149,I1ff35ea9 am: 3806fc0943

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

Change-Id: Ie4d910fb6851d8da7ea1b21fb02c08e512ba3e78
This commit is contained in:
Colin Cross 2020-08-27 00:59:23 +00:00 committed by Automerger Merge Worker
commit fb6ddeb5fd
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apex/apex_test.go
View file

@ -5399,29 +5399,6 @@ func TestApexMutatorsDontRunIfDisabled(t *testing.T) {
}
}
func TestApexWithJniLibs_Errors(t *testing.T) {
testApexError(t, `jni_libs: "xxx" is not a cc_library`, `
apex {
name: "myapex",
key: "myapex.key",
jni_libs: ["xxx"],
}
apex_key {
name: "myapex.key",
public_key: "testkey.avbpubkey",
private_key: "testkey.pem",
}
prebuilt_etc {
name: "xxx",
src: "xxx",
}
`, withFiles(map[string][]byte{
"xxx": nil,
}))
}
func TestAppBundle(t *testing.T) {
ctx, _ := testApex(t, `
apex {

29
sh/sh_binary.go
View file

@ -64,6 +64,12 @@ type shBinaryProperties struct {
// install symlinks to the binary
Symlinks []string `android:"arch_variant"`
// Make this module available when building for ramdisk.
Ramdisk_available *bool
// Make this module available when building for recovery.
Recovery_available *bool
}
type TestProperties struct {
@ -158,6 +164,29 @@ func (s *ShBinary) Symlinks() []string {
return s.properties.Symlinks
}
var _ android.ImageInterface = (*ShBinary)(nil)
func (s *ShBinary) ImageMutatorBegin(ctx android.BaseModuleContext) {}
func (s *ShBinary) CoreVariantNeeded(ctx android.BaseModuleContext) bool {
return !s.ModuleBase.InstallInRecovery() && !s.ModuleBase.InstallInRamdisk()
}
func (s *ShBinary) RamdiskVariantNeeded(ctx android.BaseModuleContext) bool {
return proptools.Bool(s.properties.Ramdisk_available) || s.ModuleBase.InstallInRamdisk()
}
func (s *ShBinary) RecoveryVariantNeeded(ctx android.BaseModuleContext) bool {
return proptools.Bool(s.properties.Recovery_available) || s.ModuleBase.InstallInRecovery()
}
func (s *ShBinary) ExtraImageVariations(ctx android.BaseModuleContext) []string {
return nil
}
func (s *ShBinary) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {
}
func (s *ShBinary) generateAndroidBuildActions(ctx android.ModuleContext) {
s.sourceFilePath = android.PathForModuleSrc(ctx, proptools.String(s.properties.Src))
filename := proptools.String(s.properties.Filename)