From b9db38631ec2d46b919f61514ceed595624cb2b2 Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Thu, 4 Jan 2024 16:34:49 +0800
Subject: [PATCH] Ignore LOCAL_XTS_TEST_PACKAGE translation

This commit enables `androidmk` to skip checking the obsolete attribute
`LOCAL_XTS_TEST_PACKAGE` without generating warning message.

Bug: 318619340
Test: m androidmk && androidmk <somewhere>/Android.mk
Change-Id: I42dbbd4aa1c61b9e344bfb219b372a0c48d77645
---
 androidmk/androidmk/android.go        |  1 +
 androidmk/androidmk/androidmk_test.go | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go
index 276b9abd1..656491181 100644
--- a/androidmk/androidmk/android.go
+++ b/androidmk/androidmk/android.go
@@ -86,6 +86,7 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){
 
 	"LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin
 	"LOCAL_CTS_TEST_PACKAGE":             skip, // Obsolete
+	"LOCAL_XTS_TEST_PACKAGE":             skip, // Obsolete
 	"LOCAL_JACK_ENABLED":                 skip, // Obselete
 	"LOCAL_JACK_FLAGS":                   skip, // Obselete
 }
diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go
index 0580ae5b6..08bbb3991 100644
--- a/androidmk/androidmk/androidmk_test.go
+++ b/androidmk/androidmk/androidmk_test.go
@@ -820,6 +820,26 @@ android_test {
 
     data: ["file1"],
 }
+`,
+	},
+	{
+		desc: "IGNORE_LOCAL_XTS_TEST_PACKAGE",
+		in: `
+include $(CLEAR_VARS)
+LOCAL_PACKAGE_NAME := FooTest
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_XTS_TEST_PACKAGE := foo.bar
+LOCAL_COMPATIBILITY_SUPPORT_FILES := file1
+include $(BUILD_CTS_PACKAGE)
+`,
+		expected: `
+android_test {
+    name: "FooTest",
+    defaults: ["cts_defaults"],
+    test_suites: ["cts"],
+
+    data: ["file1"],
+}
 `,
 	},
 	{