Merge "Convert tools/device-setup/**/Android.mk files to Android.bp"
am: 425a71f641
Change-Id: I0d81a73e195390d42a37cc9a77ea1c983eb92b10
diff --git a/tools/device-setup/Android.mk b/tools/device-setup/Android.mk
deleted file mode 100644
index 0a05aed..0000000
--- a/tools/device-setup/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2008 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.
-
-include $(call all-subdir-makefiles)
diff --git a/tools/device-setup/TestDeviceSetup/Android.bp b/tools/device-setup/TestDeviceSetup/Android.bp
new file mode 100644
index 0000000..86a4136
--- /dev/null
+++ b/tools/device-setup/TestDeviceSetup/Android.bp
@@ -0,0 +1,31 @@
+// Copyright (C) 2008 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_helper_app {
+ name: "TestDeviceSetup",
+ defaults: ["cts_support_defaults"],
+ srcs: ["**/*.java"],
+
+ // because it is in data, do not strip classes.dex
+ dex_preopt: {
+ enabled: false,
+ },
+ optimize: {
+ enabled: false,
+ },
+ static_libs: ["compatibility-device-util-axt"],
+ // uncomment when b/13282254 is fixed
+ //version: "current",
+ sdk_version: "test_current",
+}
diff --git a/tools/device-setup/TestDeviceSetup/Android.mk b/tools/device-setup/TestDeviceSetup/Android.mk
deleted file mode 100644
index b8380d3..0000000
--- a/tools/device-setup/TestDeviceSetup/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2008 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)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-# and because it is in data, do not strip classes.dex
-LOCAL_DEX_PREOPT := false
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt
-
-# uncomment when b/13282254 is fixed
-#LOCAL_SDK_VERSION := current
-LOCAL_SDK_VERSION := system_current
-
-LOCAL_PACKAGE_NAME := TestDeviceSetup
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
-
-# ======================================================
-# also build a static host library for the device info constants
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := src/android/tests/getinfo/DeviceInfoConstants.java
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ctsdeviceinfolib
-
-include $(BUILD_HOST_JAVA_LIBRARY)