diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-09-17 16:49:21 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-24 12:34:03 +0200 |
| commit | 7dfb545d0f92125162ba2bacdfa1b96e88d06886 (patch) | |
| tree | 5909fb56d89fe1b6883db362b88b7df1782ad1bc /library | |
| parent | abaf93c8f92de8b8d44173e78b0d7629b0324031 (diff) | |
| download | multidex-7dfb545d0f92125162ba2bacdfa1b96e88d06886.tar.gz | |
Express a clearer status about supported versions.
By explaining the full story in README.txt.
By inlining API 11 constants so we can really compile the library against API 4.
(cherry picked from commit e99daea7a3aec5ffac13b4283685e8d2a5994ad9)
Bug: 18112662
Change-Id: I03a4d5f773bebbe09fcde04a340bdf8abfdbc068
Diffstat (limited to 'library')
| -rw-r--r-- | library/Android.mk | 2 | ||||
| -rw-r--r-- | library/README.txt | 12 | ||||
| -rw-r--r-- | library/project.properties | 2 | ||||
| -rw-r--r-- | library/src/android/support/multidex/MultiDexExtractor.java | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/library/Android.mk b/library/Android.mk index 7d5cbb7..053084f 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android-support-multidex -LOCAL_SDK_VERSION := 11 +LOCAL_SDK_VERSION := 4 LOCAL_SRC_FILES := $(call all-java-files-under, src) ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" diff --git a/library/README.txt b/library/README.txt index df4772a..62e8737 100644 --- a/library/README.txt +++ b/library/README.txt @@ -1,7 +1,13 @@ -Library Project including compatibility multi dex loader. +Library Project including a multidex loader. -This can be used by an Android project to install classloader -with multiple dex of applications running on API 14+. +This can be used by an Android project to install multiple dexes +in the classloader of an application running on API 4+. + +Note that multidexing will allow to go over the dex index limit. +It can also help with the linearalloc limit during installation but it +won't help with linearalloc at execution time. This means that +most applications requiring multidexing because of the dex index +limit won't execute on API below 14 because of linearalloc limit. There is technically no source, but the src folder is necessary to ensure that the build system works. The content is actually diff --git a/library/project.properties b/library/project.properties index 1b8c5a3..22e1c48 100644 --- a/library/project.properties +++ b/library/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-14 android.library=true diff --git a/library/src/android/support/multidex/MultiDexExtractor.java b/library/src/android/support/multidex/MultiDexExtractor.java index b7e0a11..b5973c5 100644 --- a/library/src/android/support/multidex/MultiDexExtractor.java +++ b/library/src/android/support/multidex/MultiDexExtractor.java @@ -243,9 +243,9 @@ final class MultiDexExtractor { private static SharedPreferences getMultiDexPreferences(Context context) { return context.getSharedPreferences(PREFS_FILE, - Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB + Build.VERSION.SDK_INT < 11 /* Build.VERSION_CODES.HONEYCOMB */ ? Context.MODE_PRIVATE - : Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS); + : Context.MODE_PRIVATE | 0x0004 /* Context.MODE_MULTI_PROCESS */); } /** |