From 52f6ba9a9da61c5839034a9cc25d98d6f460b31c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sun, 26 Feb 2017 08:55:26 -0800
Subject: [PATCH] Move SystemPerfTest out of java.* namespace

dx doesn't like classes in the java.* namespace unless it is compiling
a core library.  Move SystemPerfTest to
android.perftests.SystemPerfTest.

Test: builds
Change-Id: I24951d2c9a71d8bb873763d1ccd2f1a67f2be64e
---
 apct-tests/perftests/core/jni/SystemPerfTest.cpp                | 2 +-
 .../src/{java/lang => android}/perftests/SystemPerfTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename apct-tests/perftests/core/src/{java/lang => android}/perftests/SystemPerfTest.java (99%)

diff --git a/apct-tests/perftests/core/jni/SystemPerfTest.cpp b/apct-tests/perftests/core/jni/SystemPerfTest.cpp
index eb5540844808e..f102e3ec0a71a 100644
--- a/apct-tests/perftests/core/jni/SystemPerfTest.cpp
+++ b/apct-tests/perftests/core/jni/SystemPerfTest.cpp
@@ -73,7 +73,7 @@ jint JNI_OnLoad(JavaVM* jvm, void*) {
         return JNI_ERR;
     }
 
-    if (registerNativeMethods(env, "java/lang/perftests/SystemPerfTest",
+    if (registerNativeMethods(env, "android/perftests/SystemPerfTest",
             sMethods, NELEM(sMethods)) == -1) {
         return JNI_ERR;
     }
diff --git a/apct-tests/perftests/core/src/java/lang/perftests/SystemPerfTest.java b/apct-tests/perftests/core/src/android/perftests/SystemPerfTest.java
similarity index 99%
rename from apct-tests/perftests/core/src/java/lang/perftests/SystemPerfTest.java
rename to apct-tests/perftests/core/src/android/perftests/SystemPerfTest.java
index afc9d0cf10e1a..95a7144860625 100644
--- a/apct-tests/perftests/core/src/java/lang/perftests/SystemPerfTest.java
+++ b/apct-tests/perftests/core/src/android/perftests/SystemPerfTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package java.lang.perftests;
+package android.perftests;
 
 import android.perftests.utils.BenchmarkState;
 import android.perftests.utils.PerfStatusReporter;