diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-03-11 18:04:55 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2013-03-12 10:50:28 -0700 |
| commit | a1fece009f2e93250b2d3bc8ee4a296d100da6dc (patch) | |
| tree | 2a5f422262a24a6dea9b9695eb9af056b790a9f9 /core/java_library.mk | |
| parent | 099ad657da87ec2b040af786bd26de4099dc1d0f (diff) | |
| download | build-a1fece009f2e93250b2d3bc8ee4a296d100da6dc.zip build-a1fece009f2e93250b2d3bc8ee4a296d100da6dc.tar.gz build-a1fece009f2e93250b2d3bc8ee4a296d100da6dc.tar.bz2 | |
Add LOCAL_APK_LIBRARIES argument.
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.
Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed. This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes. (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)
Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
Diffstat (limited to 'core/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index 62b16c3..d65a3ca 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -35,11 +35,13 @@ ifneq (true,$(WITH_DEXPREOPT)) LOCAL_DEX_PREOPT := else ifeq (,$(TARGET_BUILD_APPS)) +ifeq (,$(LOCAL_APK_LIBRARIES)) ifndef LOCAL_DEX_PREOPT LOCAL_DEX_PREOPT := true endif endif endif +endif ifeq (false,$(LOCAL_DEX_PREOPT)) LOCAL_DEX_PREOPT := endif |