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
This commit is contained in:
Dan Albert
2016-10-19 14:04:41 -07:00
parent 7b872837c6
commit 4098deb0b8
2 changed files with 32 additions and 9 deletions

View File

@@ -37,6 +37,7 @@ const productVariablesFileName = "soong.variables"
// 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 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
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
}