From d3bfa334632023b5401df247e60cb43844cdaa72 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 7 Mar 2017 15:13:59 +0000
Subject: Restructure files to match upstream objenesis

Makes the file structure match upstream objenesis so that it is
simpler to update in future. Moving the files as a separate
step to upgrading makes it easier for git to track renames and
simplifies future diffs and reviews.

Bug: 32912773
Test: make checkbuild
Change-Id: Iab45c5439b713dc600131c2cba243ca026c190a4
---
 tck-android/Android.mk                             |  6 +--
 .../objenesis/tck/android/TckInstrumentation.java  | 53 ++++++++++++++++++++++
 .../objenesis/tck/android/TckInstrumentation.java  | 53 ----------------------
 3 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java
 delete mode 100644 tck-android/src/org/objenesis/tck/android/TckInstrumentation.java

(limited to 'tck-android')

diff --git a/tck-android/Android.mk b/tck-android/Android.mk
index 7697f47..41752f1 100644
--- a/tck-android/Android.mk
+++ b/tck-android/Android.mk
@@ -19,8 +19,8 @@ LOCAL_PATH := $(call my-dir)
 # -------------------------------
 # Builds the deployable Objenesis TCK for Android
 # To build and run:
-#    make APP-ObjenesisTck
-#    adb install -r out/target/product/generic/data/app/ObjenesisTck.apk
+#    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)
@@ -29,5 +29,5 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_CERTIFICATE := platform
 
 LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
 include $(BUILD_PACKAGE)
diff --git a/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java
new file mode 100644
index 0000000..23ee5cf
--- /dev/null
+++ b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2006-2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.objenesis.tck.android;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.os.Bundle;
+
+import org.objenesis.tck.Main;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+
+/**
+ * Wraps the Objenesis TCK so that it can be invoked on Android as an {@link Instrumentation}.
+ *
+ * @author Ian Parkinson (Google Inc.)
+ */
+public class TckInstrumentation extends Instrumentation {
+
+   public void onCreate(Bundle arguments) {
+      ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+      PrintStream printStream = new PrintStream(outputStream);
+      System.setOut(printStream);
+
+      try {
+         Main.main(new String[0]);
+      } catch (IOException e) {
+         e.printStackTrace();
+      }
+    
+      Bundle bundle = new Bundle();
+      String fromStdout = outputStream.toString();
+      bundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT, fromStdout);
+      finish(Activity.RESULT_OK, bundle);
+   }
+}
+
diff --git a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java b/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java
deleted file mode 100644
index 23ee5cf..0000000
--- a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2006-2013 the original author or authors.
- *
- * 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.
- */
-
-package org.objenesis.tck.android;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.os.Bundle;
-
-import org.objenesis.tck.Main;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-/**
- * Wraps the Objenesis TCK so that it can be invoked on Android as an {@link Instrumentation}.
- *
- * @author Ian Parkinson (Google Inc.)
- */
-public class TckInstrumentation extends Instrumentation {
-
-   public void onCreate(Bundle arguments) {
-      ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      PrintStream printStream = new PrintStream(outputStream);
-      System.setOut(printStream);
-
-      try {
-         Main.main(new String[0]);
-      } catch (IOException e) {
-         e.printStackTrace();
-      }
-    
-      Bundle bundle = new Bundle();
-      String fromStdout = outputStream.toString();
-      bundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT, fromStdout);
-      finish(Activity.RESULT_OK, bundle);
-   }
-}
-
-- 
cgit v1.2.3