Merge "Add override_android_test."
diff --git a/rust/androidmk.go b/rust/androidmk.go
index 2a9a6c0..edd5c5f 100644
--- a/rust/androidmk.go
+++ b/rust/androidmk.go
@@ -89,6 +89,7 @@
func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
test.binaryDecorator.AndroidMk(ctx, ret)
+ ret.Class = "NATIVE_TESTS"
stem := String(test.baseCompiler.Properties.Stem)
if stem != "" && !strings.HasSuffix(ctx.Name(), "_"+stem) {
// Avoid repeated suffix in the module name.
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 1bd3c98..909d93c 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -101,7 +101,6 @@
"tr": Allowed,
"unzip": Allowed,
"zip": Allowed,
- "zipinfo": Allowed,
// Host toolchain is removed. In-tree toolchain should be used instead.
// GCC also can't find cc1 with this implementation.