Revert "Fix ndk and aml arch order"
Revert "Add ramdisk_available to init_first_stage's deps" Revert submission 15071196-init_first_stage_soong Reason for revert: fixes b/192248690 Reverted Changes: I23cf4f975:Add ramdisk_available to init_first_stage's deps Icd98c7e24:Add ramdisk_available to init_first_stage's deps If9da9ba16:Add ramdisk_available to init_first_stage's deps Ibc8668029:Add ramdisk_available to init_first_stage's deps I3b4b8c475:Add ramdisk_available to init_first_stage's deps I59cd149e0:Completely migrate init first stage to Soong I36d789578:Add ramdisk_available to init_first_stage's deps I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule... I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars I8aab5faf3:Add ramdisk_available to init_first_stage's deps I9d5a10661:Add ramdisk_available to init_first_stage's deps Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps I7cb582ca0:Update init_first_stage I06091d15e:Add ramdisk_available to init_first_stage's deps I8bdb8dda3:Add ramdisk_available to init_first_stage's deps I7436b8dd1:Add ramdisk_available to init_first_stage's deps I39693fd86:Add ramdisk_available to init_first_stage's deps I0a9ba90f0:Add ramdisk_available to init_first_stage's deps Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps I31ce63d23:Add ramdisk_available to init_first_stage's deps Icb580f97c:Add ramdisk_available to init_first_stage's deps I044a075b7:Add ramdisk_available to init_first_stage's deps I33164a7e7:Fix ndk and aml arch order Ib8d92904a:Add ramdisk_available to sysprop_library Ibc3516453:Add install_in_root to cc_binary Change-Id: Iaccc4bada78e63fdae3249adfc668c0b30418758
This commit is contained in:
parent
8ddb08c8ec
commit
f64377ca2f
|
@ -1543,20 +1543,20 @@ type archConfig struct {
|
|||
// getNdkAbisConfig returns a list of archConfigs for the ABIs supported by the NDK.
|
||||
func getNdkAbisConfig() []archConfig {
|
||||
return []archConfig{
|
||||
{"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}},
|
||||
{"arm", "armv7-a", "", []string{"armeabi-v7a"}},
|
||||
{"x86_64", "", "", []string{"x86_64"}},
|
||||
{"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}},
|
||||
{"x86", "", "", []string{"x86"}},
|
||||
{"x86_64", "", "", []string{"x86_64"}},
|
||||
}
|
||||
}
|
||||
|
||||
// getAmlAbisConfig returns a list of archConfigs for the ABIs supported by mainline modules.
|
||||
func getAmlAbisConfig() []archConfig {
|
||||
return []archConfig{
|
||||
{"arm64", "armv8-a", "", []string{"arm64-v8a"}},
|
||||
{"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}},
|
||||
{"x86_64", "", "", []string{"x86_64"}},
|
||||
{"arm64", "armv8-a", "", []string{"arm64-v8a"}},
|
||||
{"x86", "", "", []string{"x86"}},
|
||||
{"x86_64", "", "", []string{"x86_64"}},
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue