Add an NDK ABIs mega build configuration.
The NDK needs generic prebuilts for all architectures.
Test: echo '{ "Ndk_abis": true }' > soong.config && \
./soong $OUT_DIR/ndk.timestamp
Bug: None
Change-Id: I2ee3ebbf4cbd1bc593f9e4e9fb44fb66711da9d5
diff --git a/android/config.go b/android/config.go
index 483ec91..4d7e8df 100644
--- a/android/config.go
+++ b/android/config.go
@@ -37,6 +37,7 @@
// config file. These will be included in the config struct.
type FileConfigurableOptions struct {
Mega_device *bool `json:",omitempty"`
+ Ndk_abis *bool `json:",omitempty"`
}
func (f *FileConfigurableOptions) SetDefaultConfig() {
@@ -211,8 +212,15 @@
return Config{}, err
}
+ var archConfig []archConfig
if Bool(config.Mega_device) {
- deviceTargets, err := decodeMegaDevice()
+ archConfig = getMegaDeviceConfig()
+ } else if Bool(config.Ndk_abis) {
+ archConfig = getNdkAbisConfig()
+ }
+
+ if archConfig != nil {
+ deviceTargets, err := decodeArchSettings(archConfig)
if err != nil {
return Config{}, err
}