diff options
Diffstat (limited to 'instrumentation')
| -rw-r--r-- | instrumentation/.classpath | 9 | ||||
| -rw-r--r-- | instrumentation/.project | 33 | ||||
| -rw-r--r-- | instrumentation/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | instrumentation/README (renamed from instrumentation/README.txt) | 0 | ||||
| -rw-r--r-- | instrumentation/README.android | 6 | ||||
| -rw-r--r-- | instrumentation/build.gradle | 33 | ||||
| -rw-r--r-- | instrumentation/project.properties | 15 | ||||
| -rw-r--r-- | instrumentation/res/.readme | 1 | ||||
| -rw-r--r-- | instrumentation/src/.readme | 2 |
9 files changed, 26 insertions, 75 deletions
diff --git a/instrumentation/.classpath b/instrumentation/.classpath deleted file mode 100644 index 7bc01d9..0000000 --- a/instrumentation/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="gen"/> - <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> - <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> - <classpathentry kind="output" path="bin/classes"/> -</classpath> diff --git a/instrumentation/.project b/instrumentation/.project deleted file mode 100644 index bfc77da..0000000 --- a/instrumentation/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>android-support-multidex-instrumentation</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.android.ide.eclipse.adt.ApkBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>com.android.ide.eclipse.adt.AndroidNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/instrumentation/AndroidManifest.xml b/instrumentation/AndroidManifest.xml index 6107fd3..7b9f92c 100644 --- a/instrumentation/AndroidManifest.xml +++ b/instrumentation/AndroidManifest.xml @@ -15,6 +15,4 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.support.multidex.instrumentation"> - <uses-sdk android:minSdkVersion="4"/> - <application /> </manifest> diff --git a/instrumentation/README.txt b/instrumentation/README index 1e5da52..1e5da52 100644 --- a/instrumentation/README.txt +++ b/instrumentation/README diff --git a/instrumentation/README.android b/instrumentation/README.android deleted file mode 100644 index 322676b..0000000 --- a/instrumentation/README.android +++ /dev/null @@ -1,6 +0,0 @@ -Library Project including compatibility IntrumentationTestRunner -for multiple dex applications. - -This can be used by an Android test project to set up the classloader -of applications with multiple dexes. - diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle index 15ea3e8..adea6d7 100644 --- a/instrumentation/build.gradle +++ b/instrumentation/build.gradle @@ -1,9 +1,32 @@ -apply plugin: 'android-library' -archivesBaseName = 'multidex-instrumentation' +/* + * 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. + */ + +apply plugin: 'com.android.library' + +dependencies { + compile project(':support-multidex') +} android { compileSdkVersion 4 + defaultConfig { + minSdkVersion 4 + } + sourceSets { main { java.srcDirs = ['src'] @@ -19,10 +42,6 @@ android { } } -dependencies { - compile project(':library') -} - uploadArchives { repositories { mavenDeployer { @@ -55,4 +74,4 @@ uploadArchives { } } } -}
\ No newline at end of file +} diff --git a/instrumentation/project.properties b/instrumentation/project.properties deleted file mode 100644 index 22e1c48..0000000 --- a/instrumentation/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-14 -android.library=true diff --git a/instrumentation/res/.readme b/instrumentation/res/.readme deleted file mode 100644 index cc903f6..0000000 --- a/instrumentation/res/.readme +++ /dev/null @@ -1 +0,0 @@ -This hidden file is there to ensure there is an res folder.
\ No newline at end of file diff --git a/instrumentation/src/.readme b/instrumentation/src/.readme deleted file mode 100644 index 4bcebad..0000000 --- a/instrumentation/src/.readme +++ /dev/null @@ -1,2 +0,0 @@ -This hidden file is there to ensure there is an src folder. -Once we support binary library this will go away.
\ No newline at end of file |