From 89eaa93af9a8a4b295e22890433b70b2565fa8ae Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Wed, 3 Apr 2019 11:42:07 -0700
Subject: [PATCH] Convert core/tests/featureflagtests/Android.mk file to
 Android.bp

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

Bug: 122332340
Test: treehugger
Change-Id: If3f574bc15dedcd7880be605667297d257175c8d
---
 core/tests/featureflagtests/Android.bp | 19 +++++++++++++++++++
 core/tests/featureflagtests/Android.mk | 20 --------------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 core/tests/featureflagtests/Android.bp
 delete mode 100644 core/tests/featureflagtests/Android.mk

diff --git a/core/tests/featureflagtests/Android.bp b/core/tests/featureflagtests/Android.bp
new file mode 100644
index 0000000000000..8730b7012c4a0
--- /dev/null
+++ b/core/tests/featureflagtests/Android.bp
@@ -0,0 +1,19 @@
+android_test {
+    name: "FrameworksCoreFeatureFlagTests",
+    // We only want this apk build for tests.
+    // Include all test java files.
+    srcs: ["src/**/*.java"],
+    dxflags: ["--core-library"],
+    static_libs: [
+        "android-common",
+        "frameworks-core-util-lib",
+        "androidx.test.rules",
+    ],
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    platform_apis: true,
+    certificate: "platform",
+    test_suites: ["device-tests"],
+}
diff --git a/core/tests/featureflagtests/Android.mk b/core/tests/featureflagtests/Android.mk
deleted file mode 100644
index ce7cb181b53a9..0000000000000
--- a/core/tests/featureflagtests/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_DX_FLAGS := --core-library
-LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib androidx.test.rules
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_CERTIFICATE := platform
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)