diff options
| author | Ying Wang <wangying@google.com> | 2010-09-27 12:05:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-27 12:05:56 -0700 |
| commit | e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e (patch) | |
| tree | 665c442152698095beffb512b5dc22e10dddd0b3 /core/main.mk | |
| parent | 5d40d86c6129ee15f4eacbe9987df94f0d3db53e (diff) | |
| parent | dc45f86af8d5c2cdc743bee8878fe005cf8222d8 (diff) | |
| download | build-e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e.zip build-e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e.tar.gz build-e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e.tar.bz2 | |
resolved conflicts for merge of dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index 7a1d42d..a6d3f29 100644 --- a/core/main.mk +++ b/core/main.mk @@ -224,9 +224,11 @@ ifneq (,$(user_variant)) # TODO: Remove this and the corresponding block in # config/product_config.make once host-based Dalvik preoptimization is # working. + ifneq (true,$(DISABLE_DEXPREOPT)) ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true) WITH_DEXPREOPT := true endif + endif # Disallow mock locations by default for user builds ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0 |