diff options
| author | Ying Wang <wangying@google.com> | 2010-09-22 17:19:11 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-22 17:19:11 -0700 |
| commit | 3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3 (patch) | |
| tree | 3b70edf561e50f5aae152a02857fedb7d34f261c /core/config.mk | |
| parent | 1613f4ff1ee432a01fcce70a9020f19929e7290a (diff) | |
| parent | 9f28f0d76e31c9cce0aecb06091cf0e40b44fd0e (diff) | |
| download | build-3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3.zip build-3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3.tar.gz build-3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3.tar.bz2 | |
resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 3a068d8..51283ee 100644 --- a/core/config.mk +++ b/core/config.mk @@ -221,6 +221,8 @@ JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar PROGUARD := external/proguard/bin/proguard.sh JAVATAGS := build/tools/java-event-log-tags.py SLANG := $(HOST_OUT_EXECUTABLES)/slang$(HOST_EXECUTABLE_SUFFIX) +DEXOPT := $(HOST_OUT_EXECUTABLES)/dexopt$(HOST_EXECUTABLE_SUFFIX) +DEXPREOPT := dalvik/tools/dex-preopt # ACP is always for the build OS, not for the host OS ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX) |