Skip to content

Commit 612084c

Browse files
DanAlbertGelbpunkt
authored andcommitted
Drop support for KitKat.
The NDK is dropping support for this. Bug: android/ndk#1751 Test: treehugger Change-Id: I6c03dfc364e7612ce4f45fb58746726983cf5b74
1 parent 58be92a commit 612084c

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

android/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ func (c *config) PlatformVersionLastStable() string {
782782
}
783783

784784
func (c *config) MinSupportedSdkVersion() ApiLevel {
785-
return uncheckedFinalApiLevel(19)
785+
return uncheckedFinalApiLevel(21)
786786
}
787787

788788
func (c *config) FinalApiLevels() []ApiLevel {

cc/cc_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -4023,7 +4023,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
40234023
"${config.ArmArmv7ANeonCflags}",
40244024
"${config.ArmGenericCflags}",
40254025
"-target",
4026-
"armv7a-linux-androideabi20",
4026+
"armv7a-linux-androideabi21",
40274027
}
40284028

40294029
expectedIncludes := []string{
@@ -4054,7 +4054,6 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
40544054
"external/foo/lib32",
40554055
"external/foo/libandroid_arm",
40564056
"defaults/cc/common/ndk_libc++_shared",
4057-
"defaults/cc/common/ndk_libandroid_support",
40584057
}
40594058

40604059
conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}
@@ -4147,20 +4146,20 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
41474146
},
41484147
},
41494148
stl: "libc++",
4150-
sdk_version: "20",
4149+
sdk_version: "minimum",
41514150
}
41524151
41534152
cc_library_headers {
41544153
name: "libheader1",
41554154
export_include_dirs: ["libheader1"],
4156-
sdk_version: "20",
4155+
sdk_version: "minimum",
41574156
stl: "none",
41584157
}
41594158
41604159
cc_library_headers {
41614160
name: "libheader2",
41624161
export_include_dirs: ["libheader2"],
4163-
sdk_version: "20",
4162+
sdk_version: "minimum",
41644163
stl: "none",
41654164
}
41664165
`, tc.src)
@@ -4184,7 +4183,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
41844183
cc_library {
41854184
name: "%s",
41864185
export_include_dirs: ["%s"],
4187-
sdk_version: "20",
4186+
sdk_version: "minimum",
41884187
stl: "none",
41894188
}
41904189
`, lib, lib)

0 commit comments

Comments
 (0)