diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-05-05 14:05:51 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2017-05-05 14:05:51 -0700 |
| commit | 5cecf1643c4b57d1bc1033619ea308f1cce1eb17 (patch) | |
| tree | 457d7f65105262409125039ec37e71495819a062 /library | |
| parent | 996bd8bf2d65cffa3ea9b64fddef9dab51b56af5 (diff) | |
| download | multidex-5cecf1643c4b57d1bc1033619ea308f1cce1eb17.tar.gz | |
Remove VERSION AndroidManifest meta-tag.
These is a conflict when using this meta tag together with Android Support
Library as it specifies a different version.
Bug: 38037855
Test: ./gradlew dist
Change-Id: If23423bcbf93a4cd4a0b5e3a5593d1f563756933
Diffstat (limited to 'library')
| -rw-r--r-- | library/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | library/build.gradle | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index 8da151d..781e6a7 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -15,5 +15,4 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.support.multidex"> - <meta-data android:name="android.support.VERSION" android:value="${multidex-version}" /> </manifest> diff --git a/library/build.gradle b/library/build.gradle index e882989..abb8c49 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -21,9 +21,6 @@ android { defaultConfig { minSdkVersion 4 - - // Update the version meta-data in Manifest. - addManifestPlaceholders(["multidex-version": project.rootProject.ext.multidexVersion]) } sourceSets { |