Initial prebuilt support
Support prebuilt shared libraries as an initial proof-of-concept of
prebuilts. Future changes will support binaries and static libraries,
and the ability to select which to use based on something besides
blueprint properties.
Test: TestPrebuilts run during m -j
Change-Id: I6e84da667e9005ae11844bad01d25cbe4ced1ce3
diff --git a/android/androidmk.go b/android/androidmk.go
index 28c2290..469ac7f 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -34,6 +34,7 @@
type AndroidMkDataProvider interface {
AndroidMk() (AndroidMkData, error)
+ BaseModuleName() string
}
type AndroidMkData struct {
@@ -142,13 +143,12 @@
}
func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod blueprint.Module) error {
- name := ctx.ModuleName(mod)
-
provider, ok := mod.(AndroidMkDataProvider)
if !ok {
return nil
}
+ name := provider.BaseModuleName()
amod := mod.(Module).base()
data, err := provider.AndroidMk()
if err != nil {
@@ -156,7 +156,11 @@
}
if !amod.Enabled() {
- return err
+ return nil
+ }
+
+ if amod.commonProperties.SkipInstall {
+ return nil
}
if data.SubName != "" {