Merge "Convert Android.mk file to Android.bp" am: bac50c02f3 am: 2f9c9126c5
am: 744f753795
Change-Id: I4a3095f083cc24fc7dddb7da1a7e845ad121aa00
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 085c7f8..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2013 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 $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/tck-android/Android.bp b/tck-android/Android.bp
new file mode 100644
index 0000000..7de3742
--- /dev/null
+++ b/tck-android/Android.bp
@@ -0,0 +1,34 @@
+// Copyright (C) 2017 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.
+//
+//
+
+// -------------------------------
+// Builds the deployable Objenesis TCK for Android
+// To build and run:
+// make ObjenesisTck
+// adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk
+// adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation
+
+android_test {
+ name: "ObjenesisTck",
+ sdk_version: "current",
+ certificate: "platform",
+ static_libs: [
+ "objenesis-tck",
+ "junit",
+ ],
+ libs: ["android.test.base"],
+ srcs: ["src/main/java/**/*.java"],
+}
diff --git a/tck-android/Android.mk b/tck-android/Android.mk
deleted file mode 100644
index 877e72b..0000000
--- a/tck-android/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2017 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)
-
-# -------------------------------
-# Builds the deployable Objenesis TCK for Android
-# To build and run:
-# make ObjenesisTck
-# adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk
-# adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation
-
-include $(CLEAR_VARS)
-LOCAL_PACKAGE_NAME := ObjenesisTck
-LOCAL_SDK_VERSION := current
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck junit
-LOCAL_JAVA_LIBRARIES := android.test.base
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-include $(BUILD_PACKAGE)
