From e304da543eaf8a89d156dfbd3650166378f3fe35 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Tue, 19 May 2020 12:17:43 -0700
Subject: [PATCH] Convert core/tests/privacytests/Android.mk file to Android.bp

See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger, atest FrameworksPrivacyLibraryTests
Change-Id: I000a5a635874ce88d32e8172d07f74c3fbb153c5
---
 core/tests/privacytests/Android.bp | 14 ++++++++++++++
 core/tests/privacytests/Android.mk | 20 --------------------
 2 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 core/tests/privacytests/Android.bp
 delete mode 100644 core/tests/privacytests/Android.mk

diff --git a/core/tests/privacytests/Android.bp b/core/tests/privacytests/Android.bp
new file mode 100644
index 0000000000000..7f56992877969
--- /dev/null
+++ b/core/tests/privacytests/Android.bp
@@ -0,0 +1,14 @@
+android_test {
+    name: "FrameworksPrivacyLibraryTests",
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "junit",
+        "rappor-tests",
+        "androidx.test.rules",
+        "truth-prebuilt",
+    ],
+    libs: ["android.test.runner"],
+    platform_apis: true,
+    certificate: "platform",
+    test_suites: ["device-tests"],
+}
diff --git a/core/tests/privacytests/Android.mk b/core/tests/privacytests/Android.mk
deleted file mode 100644
index 7765977c03e88..0000000000000
--- a/core/tests/privacytests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := junit rappor-tests androidx.test.rules truth-prebuilt
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := FrameworksPrivacyLibraryTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_CERTIFICATE := platform
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)