diff options
| author | Ying Wang <wangying@android.com> | 2014-09-20 00:38:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-20 00:38:08 +0000 |
| commit | b69b7d7fba2a03faa1405da5bde9b6b559c758b2 (patch) | |
| tree | 9deafcea1dd202a7020afc165658ccfee57e45d6 /core/Makefile | |
| parent | 70d3c707caa45968508d45c703b0edb13199b5ea (diff) | |
| parent | 7c02ec91e83e53377943803a276424e6a51c257a (diff) | |
| download | build-b69b7d7fba2a03faa1405da5bde9b6b559c758b2.zip build-b69b7d7fba2a03faa1405da5bde9b6b559c758b2.tar.gz build-b69b7d7fba2a03faa1405da5bde9b6b559c758b2.tar.bz2 | |
Merge "Fix recovery image build for 32p"
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile index c8a2892..6fcd394 100644 --- a/core/Makefile +++ b/core/Makefile @@ -661,7 +661,7 @@ recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolic recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET) -recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery +recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery,,,$(TARGET_PREFER_32_BIT))/recovery recovery_resources_common := $(call include-path-for, recovery)/res # Select the 18x32 font on high-density devices; and the 12x22 font on @@ -1156,11 +1156,11 @@ define package_files-copy-root endef built_ota_tools := \ - $(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \ - $(call intermediates-dir-for,EXECUTABLES,applypatch_static)/applypatch_static \ - $(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \ - $(call intermediates-dir-for,EXECUTABLES,sqlite3)/sqlite3 \ - $(call intermediates-dir-for,EXECUTABLES,updater)/updater + $(call intermediates-dir-for,EXECUTABLES,applypatch,,,$(TARGET_PREFER_32_BIT))/applypatch \ + $(call intermediates-dir-for,EXECUTABLES,applypatch_static,,,$(TARGET_PREFER_32_BIT))/applypatch_static \ + $(call intermediates-dir-for,EXECUTABLES,check_prereq,,,$(TARGET_PREFER_32_BIT))/check_prereq \ + $(call intermediates-dir-for,EXECUTABLES,sqlite3,,,$(TARGET_PREFER_32_BIT))/sqlite3 \ + $(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools) $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION) |