[hwasan] Remove deprecated compiler flag (NFC) am: 93c3f5368d am: a60c43aa23
am: f69f7ccea0
Change-Id: I5872f7af2a86b35a8aa85a165ed05690125e7abb
diff --git a/Android.bp b/Android.bp
index a70f73c..f356fce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -480,6 +480,7 @@
kernel_headers {
name: "device_kernel_headers",
vendor: true,
+ recovery_available: true,
}
cc_genrule {
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 4ec787f..bfa7873 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -97,9 +97,8 @@
pctx.StaticVariable("ClangExtraCflags", strings.Join([]string{
"-D__compiler_offsetof=__builtin_offsetof",
- // Make implicit fallthrough an error in the future.
+ // -Wimplicit-fallthrough is not enabled by -Wall.
"-Wimplicit-fallthrough",
- "-Wno-error=implicit-fallthrough",
// Help catch common 32/64-bit errors.
"-Werror=int-conversion",
@@ -164,11 +163,6 @@
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-tautological-unsigned-zero-compare",
- // http://b/72330874 Disable -Wenum-compare until the instances detected by this new
- // warning are fixed.
- "-Wno-enum-compare",
- "-Wno-enum-compare-switch",
-
// Disable c++98-specific warning since Android is not concerned with C++98
// compatibility.
"-Wno-c++98-compat-extra-semi",
@@ -177,9 +171,11 @@
"-Wno-return-std-move-in-c++11",
}, " "))
- // Extra cflags for projects under external/ directory
+ // Extra cflags for projects under external/ directory to disable warnings that are infeasible
+ // to fix in all the external projects and their upstream repos.
pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
- // TODO(yikong): Move -Wno flags here
+ "-Wno-enum-compare",
+ "-Wno-enum-compare-switch",
// http://b/72331524 Allow null pointer arithmetic until the instances detected by
// this new warning are fixed.
diff --git a/java/config/config.go b/java/config/config.go
index 5c838a5..a43d790 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -29,7 +29,7 @@
DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"}
DefaultSystemModules = "core-platform-api-stubs-system-modules"
- DefaultLibraries = []string{"ext", "framework"}
+ DefaultLibraries = []string{"ext", "framework", "updatable_media_stubs"}
DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"
@@ -43,6 +43,7 @@
"android.car7",
"core-oj",
"core-libart",
+ "updatable-media",
}
ManifestMergerClasspath = []string{
diff --git a/java/java_test.go b/java/java_test.go
index a0b8952..a8cbfd1 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -117,6 +117,7 @@
"core-lambda-stubs",
"framework",
"ext",
+ "updatable_media_stubs",
"android_stubs_current",
"android_system_stubs_current",
"android_test_stubs_current",
@@ -955,7 +956,7 @@
checkPatchModuleFlag(t, ctx, "foo", "")
expected := "java.base=.:" + buildDir
checkPatchModuleFlag(t, ctx, "bar", expected)
- expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework")}, ":")
+ expected = "java.base=" + strings.Join([]string{".", buildDir, moduleToPath("ext"), moduleToPath("framework"), moduleToPath("updatable_media_stubs")}, ":")
checkPatchModuleFlag(t, ctx, "baz", expected)
})
}
diff --git a/java/sdk_test.go b/java/sdk_test.go
index 6924e26..a11ea2f 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -39,14 +39,14 @@
name: "default",
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
+ classpath: []string{"ext", "framework", "updatable_media_stubs"},
},
{
name: "blank sdk version",
properties: `sdk_version: "",`,
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
+ classpath: []string{"ext", "framework", "updatable_media_stubs"},
},
{