@@ -4023,7 +4023,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
4023
4023
"${config.ArmArmv7ANeonCflags}" ,
4024
4024
"${config.ArmGenericCflags}" ,
4025
4025
"-target" ,
4026
- "armv7a-linux-androideabi20 " ,
4026
+ "armv7a-linux-androideabi21 " ,
4027
4027
}
4028
4028
4029
4029
expectedIncludes := []string {
@@ -4054,7 +4054,6 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
4054
4054
"external/foo/lib32" ,
4055
4055
"external/foo/libandroid_arm" ,
4056
4056
"defaults/cc/common/ndk_libc++_shared" ,
4057
- "defaults/cc/common/ndk_libandroid_support" ,
4058
4057
}
4059
4058
4060
4059
conly := []string {"-fPIC" , "${config.CommonGlobalConlyflags}" }
@@ -4147,20 +4146,20 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
4147
4146
},
4148
4147
},
4149
4148
stl: "libc++",
4150
- sdk_version: "20 ",
4149
+ sdk_version: "minimum ",
4151
4150
}
4152
4151
4153
4152
cc_library_headers {
4154
4153
name: "libheader1",
4155
4154
export_include_dirs: ["libheader1"],
4156
- sdk_version: "20 ",
4155
+ sdk_version: "minimum ",
4157
4156
stl: "none",
4158
4157
}
4159
4158
4160
4159
cc_library_headers {
4161
4160
name: "libheader2",
4162
4161
export_include_dirs: ["libheader2"],
4163
- sdk_version: "20 ",
4162
+ sdk_version: "minimum ",
4164
4163
stl: "none",
4165
4164
}
4166
4165
` , tc .src )
@@ -4184,7 +4183,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
4184
4183
cc_library {
4185
4184
name: "%s",
4186
4185
export_include_dirs: ["%s"],
4187
- sdk_version: "20 ",
4186
+ sdk_version: "minimum ",
4188
4187
stl: "none",
4189
4188
}
4190
4189
` , lib , lib )
0 commit comments