summaryrefslogtreecommitdiff
path: root/tests/GridLayoutTest
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-02-20 16:52:48 -0800
committerSasha Smundak <asmundak@google.com>2019-03-07 16:14:00 -0800
commitb6aca11e8078b4a93da1c09c94b4d0d7ba0befef (patch)
tree5e9ad0c8f23a127ff116cbd4adf1b72d1fe1bbe5 /tests/GridLayoutTest
parent10c573ff852309894b383ae9aa13dca0d64f8d3e (diff)
Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information. Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet ported to internal master. Do it later. Note: the conversion in the following directories has to be done in the internal master first because of the conflicts: * tests/ActivityManagerPerfTests * tests/AppLaunch * tests/AppLaunchWear * tests/BackgroundDexOptServiceIntegrationTests * tests/Camera2Tests/CameraToo * tests/Camera2Tests/SmartCamera/SimpleCamera * tests/Compatibility * tests/Internal * tests/RcsTests * tests/ServiceCrashTest * tests/UsbTests Bug: 122332340 Test: treehugger Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
Diffstat (limited to 'tests/GridLayoutTest')
-rw-r--r--tests/GridLayoutTest/Android.bp21
-rw-r--r--tests/GridLayoutTest/Android.mk27
2 files changed, 21 insertions, 27 deletions
diff --git a/tests/GridLayoutTest/Android.bp b/tests/GridLayoutTest/Android.bp
new file mode 100644
index 000000000000..b4b5ba561c3f
--- /dev/null
+++ b/tests/GridLayoutTest/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2010 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+android_test {
+ name: "GridLayoutTest",
+ srcs: ["**/*.java"],
+ sdk_version: "current",
+}
diff --git a/tests/GridLayoutTest/Android.mk b/tests/GridLayoutTest/Android.mk
deleted file mode 100644
index e7e3ccd56986..000000000000
--- a/tests/GridLayoutTest/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := GridLayoutTest
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE_TAGS := tests
-
-include $(BUILD_PACKAGE)