Revert "Revert "Update dexmaker on AOSP to same version as on internal master""

This reverts commit 0ad4f18077e9cac496e836c82ef99763bd7ce094.

Reason for revert: Fix in I5094fa145fc5f6d5c5d9426b07d764c07e545819

Change-Id: I5015d35f5fd464f6f86631ecb5b45e2fbbedffab

8 files changed, 108 insertions, 10 deletions

diff --git a/dexmaker-mockito-inline-tests/AndroidManifest.xml b/dexmaker-mockito-inline-tests/AndroidManifest.xml
deleted file mode 100644
index 44afd30..0000000
--- a/dexmaker-mockito-inline-tests/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest package="com.android.dexmaker.mockito.inline.tests">
-    <application />
-</manifest>
diff --git a/dexmaker-mockito-inline-tests/CMakeLists.txt b/dexmaker-mockito-inline-tests/CMakeLists.txt
new file mode 100644
index 0000000..32ce07e
--- /dev/null
+++ b/dexmaker-mockito-inline-tests/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+set(slicer_sources
+    ../dexmaker-mockito-inline/external/slicer/bytecode_encoder.cc
+    ../dexmaker-mockito-inline/external/slicer/code_ir.cc
+    ../dexmaker-mockito-inline/external/slicer/common.cc
+    ../dexmaker-mockito-inline/external/slicer/control_flow_graph.cc
+    ../dexmaker-mockito-inline/external/slicer/debuginfo_encoder.cc
+    ../dexmaker-mockito-inline/external/slicer/dex_bytecode.cc
+    ../dexmaker-mockito-inline/external/slicer/dex_format.cc
+    ../dexmaker-mockito-inline/external/slicer/dex_ir_builder.cc
+    ../dexmaker-mockito-inline/external/slicer/dex_ir.cc
+    ../dexmaker-mockito-inline/external/slicer/dex_utf8.cc
+    ../dexmaker-mockito-inline/external/slicer/instrumentation.cc
+    ../dexmaker-mockito-inline/external/slicer/reader.cc
+    ../dexmaker-mockito-inline/external/slicer/tryblocks_encoder.cc
+    ../dexmaker-mockito-inline/external/slicer/writer.cc)
+
+add_library(slicer
+            STATIC
+            ${slicer_sources})
+
+include_directories(../dexmaker-mockito-inline/external/jdk ../dexmaker-mockito-inline/external/slicer/export/)
+
+target_link_libraries(slicer z)
+
+add_library(multiplejvmtiagentsinterferenceagent
+            SHARED
+            src/main/jni/multiplejvmtiagentsinterferenceagent/agent.cc)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANDROID_STL=c++_shared -frtti -Wall -Werror -Wno-unused-parameter -Wno-shift-count-overflow -Wno-error=non-virtual-dtor -Wno-sign-compare -Wno-switch -Wno-missing-braces")
+
+target_link_libraries(multiplejvmtiagentsinterferenceagent slicer)
diff --git a/dexmaker-mockito-inline-tests/build.gradle b/dexmaker-mockito-inline-tests/build.gradle
new file mode 100644
index 0000000..5c86f89
--- /dev/null
+++ b/dexmaker-mockito-inline-tests/build.gradle
@@ -0,0 +1,53 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
+}
+
+apply plugin: "net.ltgt.errorprone"
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+
+    android {
+        lintOptions {
+            disable 'InvalidPackage'
+            warning 'NewApi'
+        }
+    }
+
+    defaultConfig {
+        minSdkVersion 28
+        targetSdkVersion 28
+        versionName VERSION_NAME
+
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+    }
+
+    externalNativeBuild {
+        cmake {
+            path 'CMakeLists.txt'
+        }
+    }
+}
+
+repositories {
+    jcenter()
+    google()
+}
+
+dependencies {
+    implementation project(':dexmaker-mockito-tests')
+    compileOnly project(':dexmaker-mockito-inline')
+    androidTestImplementation project(':dexmaker-mockito-inline')
+
+    implementation 'junit:junit:4.12'
+    implementation 'com.android.support.test:runner:1.0.1'
+    api 'org.mockito:mockito-core:2.19.0', { exclude group: 'net.bytebuddy' }
+}
diff --git a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/tests b/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/tests
deleted file mode 120000
index f13e9f0..0000000
--- a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/tests
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../dexmaker-mockito-tests/src/androidTest/java/com/android/dx/mockito/tests
\ No newline at end of file
diff --git a/dexmaker-mockito-inline-tests/src/main/AndroidManifest.xml b/dexmaker-mockito-inline-tests/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9f14dbf
--- /dev/null
+++ b/dexmaker-mockito-inline-tests/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    package="com.android.dexmaker.mockito.inline.tests"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:debuggable="true"
+        tools:ignore="HardcodedDebugMode" />
+</manifest>
diff --git a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockFinal.java b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockFinal.java
index fa02471..5903d45 100644
--- a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockFinal.java
+++ b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockFinal.java
@@ -73,7 +73,7 @@ public class MockFinal {
         assertSame(fakeBinder, mockService.onBind(new Intent()));
     }
 
-    private final class FinalNonDefaultConstructorClass {
+    private static final class FinalNonDefaultConstructorClass {
         public FinalNonDefaultConstructorClass(int i) {
         }
 
@@ -121,6 +121,7 @@ public class MockFinal {
     }
 
     private static final class SubClass extends SuperClass {
+        @Override
         String returnC() {
             return "subC";
         }
diff --git a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockNonPublic.java b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockNonPublic.java
index aa828e5..60b2845 100644
--- a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MockNonPublic.java
+++ b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MockNonPublic.java
@@ -108,6 +108,7 @@ public class MockNonPublic {
     }
 
     private static class PrivateClass implements SingleMethodInterface {
+        @Override
         public String returnA() {
             return "A";
         }
@@ -129,6 +130,7 @@ public class MockNonPublic {
     }
 
     private interface PrivateInterface extends SingleMethodInterface {
+        @Override
         String returnA();
     }
 
@@ -138,6 +140,7 @@ public class MockNonPublic {
     }
 
     private static class SubOfPrivateInterface implements PrivateInterface {
+        @Override
         public String returnA() {
             return "A";
         }
@@ -159,10 +162,12 @@ public class MockNonPublic {
     }
 
     private static abstract class PrivateAbstractClass implements DualMethodInterface {
+        @Override
         public String returnA() {
             return "A";
         }
 
+        @Override
         public abstract String returnB();
     }
 
@@ -172,6 +177,7 @@ public class MockNonPublic {
     }
 
     private static class SubOfPrivateAbstractClass extends PrivateAbstractClass {
+        @Override
         public String returnB() {
             return "B";
         }
@@ -193,6 +199,7 @@ public class MockNonPublic {
     }
 
     static class PackagePrivateClass implements SingleMethodInterface {
+        @Override
         public String returnA() {
             return "A";
         }
@@ -204,10 +211,12 @@ public class MockNonPublic {
     }
 
     static abstract class PackagePrivateAbstractClass implements DualMethodInterface {
+        @Override
         public String returnA() {
             return "A";
         }
 
+        @Override
         public abstract String returnB();
     }
 
@@ -217,6 +226,7 @@ public class MockNonPublic {
     }
 
     static class SubOfPackagePrivateAbstractClass extends PackagePrivateAbstractClass {
+        @Override
         public String returnB() {
             return "B";
         }
@@ -238,6 +248,7 @@ public class MockNonPublic {
     }
 
     interface PackagePrivateInterface extends SingleMethodInterface {
+        @Override
         String returnA();
     }
 
@@ -247,6 +258,7 @@ public class MockNonPublic {
     }
 
     static class SubOfPackagePrivateInterface implements PackagePrivateInterface {
+        @Override
         public String returnA() {
             return "A";
         }
@@ -331,6 +343,7 @@ public class MockNonPublic {
 
     public static class SubOfAbstractClassWithPackagePrivateMethod extends
             AbstractClassWithPackagePrivateMethod {
+        @Override
         String returnB() {
             return "B";
         }
diff --git a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
index 4f84276..bfc12fb 100644
--- a/dexmaker-mockito-inline-tests/src/androidTest/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
+++ b/dexmaker-mockito-inline-tests/src/main/java/com/android/dx/mockito/inline/tests/MultipleJvmtiAgentsInterference.java
@@ -16,7 +16,6 @@
 
 package com.android.dx.mockito.inline.tests;
 
-import android.os.Build;
 import android.os.Debug;
 
 import org.junit.AfterClass;
@@ -24,13 +23,12 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNull;
-import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.mock;
 
 public class MultipleJvmtiAgentsInterference {
     private static final String AGENT_LIB_NAME = "libmultiplejvmtiagentsinterferenceagent.so";
 
-    public class TestClass {
+    public static class TestClass {
         public String returnA() {
             return "A";
         }
@@ -38,8 +36,6 @@ public class MultipleJvmtiAgentsInterference {
 
     @BeforeClass
     public static void installTestAgent() throws Exception {
-        assumeTrue(Build.VERSION.SDK_INT >= 28);
-
         Debug.attachJvmtiAgent(AGENT_LIB_NAME, null,
                 MultipleJvmtiAgentsInterference.class.getClassLoader());
     }