diff options
| author | Mathieu Chartier | 2018-04-04 11:38:33 -0500 |
|---|---|---|
| committer | Mathieu Chartier | 2018-04-12 12:02:30 -0500 |
| commit | aaca16f0f7ef22ea39f103d5895c2d18235aa42d (patch) | |
| tree | feaf3e4a29651ba5b391008483279d46505c12f9 /core/dex_preopt_odex_install.mk | |
| parent | 9b72b53a24cae857d184eef051d04f37da1b385e (diff) | |
| download | platform-build-aaca16f0f7ef22ea39f103d5895c2d18235aa42d.tar.gz platform-build-aaca16f0f7ef22ea39f103d5895c2d18235aa42d.tar.xz platform-build-aaca16f0f7ef22ea39f103d5895c2d18235aa42d.zip | |
Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set
Allows modules to specify LOCAL_DEX_PREOPT_APP_IMAGE := false if they
have a profile.
Test: make
Change-Id: Ied7a8099b199904638dabdb09faf879d3216e73d
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index d462a85ee..c257f93ef 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk | |||
| @@ -112,8 +112,10 @@ ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE)) | |||
| 112 | ifdef LOCAL_VENDOR_MODULE | 112 | ifdef LOCAL_VENDOR_MODULE |
| 113 | $(call pretty-error, Internal error: profiles are not supported for vendor modules) | 113 | $(call pretty-error, Internal error: profiles are not supported for vendor modules) |
| 114 | else | 114 | else |
| 115 | ifeq (,$(LOCAL_DEX_PREOPT_APP_IMAGE)) | ||
| 115 | LOCAL_DEX_PREOPT_APP_IMAGE := true | 116 | LOCAL_DEX_PREOPT_APP_IMAGE := true |
| 116 | endif | 117 | endif |
| 118 | endif | ||
| 117 | 119 | ||
| 118 | ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING | 120 | ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING |
| 119 | $(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)) | 121 | $(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)) |