Merge "Convert external/objenesis to Android.bp"android-o-mr1-iot-preview-6o-mr1-iot-preview-6

am: 3952d75432

Change-Id: I69d5f35c19f88e96990be568578f71e9d784ae78

3 files changed, 43 insertions, 43 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..c2909e7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,42 @@
+// 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.
+//
+//
+
+java_library_static {
+    name: "objenesis",
+    host_supported: true,
+    hostdex: true,
+    srcs: ["main/src/main/java/**/*.java"],
+    //  SDK 10 needed for ObjectStreamClass lookupAny
+    sdk_version: "10",
+}
+
+// Compatibility library for old name of host target
+java_library_host {
+    name: "objenesis-host",
+    static_libs: ["objenesis"],
+}
+
+//--------------------------------
+// Builds the Objenesis TCK as a device-targeted library
+
+java_library_static {
+    name: "objenesis-tck",
+    no_framework_libs: true,
+
+    static_libs: ["objenesis"],
+    srcs: ["tck/src/main/java/**/*.java"],
+    java_resource_dirs: ["tck/src/main/resources"],
+}
diff --git a/Android.mk b/Android.mk
index 231e2b9..085c7f8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,46 +16,4 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# build for the host JVM
-#-----------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java)
-LOCAL_MODULE := objenesis-host
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build for host dalvik
-#-----------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java)
-LOCAL_MODULE := objenesis-hostdex
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
-
-#-------------------------------
-# build a target jar
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java)
-# ideally this should be called just 'objenesis', but that name is
-# already used by a prebuilt host lib.
-LOCAL_MODULE := objenesis-target
-#  SDK 10 needed for ObjectStreamClass lookupAny
-LOCAL_SDK_VERSION := 10
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#--------------------------------
-# Builds the Objenesis TCK as a device-targeted library
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := objenesis-tck-target
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_STATIC_JAVA_LIBRARIES := objenesis-target
-LOCAL_SRC_FILES := $(call all-java-files-under, tck/src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := tck/src/main/resources
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
 include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/tck-android/Android.mk b/tck-android/Android.mk
index e13d9ff..bf7ed4b 100644
--- a/tck-android/Android.mk
+++ b/tck-android/Android.mk
@@ -28,7 +28,7 @@ LOCAL_PACKAGE_NAME := ObjenesisTck
 LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := platform
 
-LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target junit
+LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck junit
 LOCAL_JAVA_LIBRARIES := legacy-android-test
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
 include $(BUILD_PACKAGE)