aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-02-23 19:36:21 (GMT)
committerMatt Garnes <matt@cyngn.com>2015-02-23 19:36:21 (GMT)
commit80aef6da3a33470c0d481027ea10088e85d26921 (patch)
tree0abd9733cb2a18994f756a983b0056cfe201d74d
parentb1eb099afd7d728ed87893ea2f6c87eff07ce9a9 (diff)
parent17426aacea937fb4dcfda4dc551d36fc52a98b94 (diff)
downloadandroid_build-caf/cm-12.0.zip
android_build-caf/cm-12.0.tar.gz
android_build-caf/cm-12.0.tar.bz2
Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.caf/cm-12.0
-rw-r--r--core/Makefile8
-rw-r--r--tools/releasetools/edify_generator.py2
2 files changed, 7 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile
index 6d4495f..7401344 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1306,8 +1306,12 @@ 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,sqlite3)/sqlite3
+ifeq ($(TARGET_ARCH),arm64)
+ built_ota_tools += $(call intermediates-dir-for,EXECUTABLES,updater,,,32)/updater
+else
+ built_ota_tools += $(call intermediates-dir-for,EXECUTABLES,updater)/updater
+endif
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 7d318a3..d6c1e38 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -116,7 +116,7 @@ class EdifyGenerator(object):
def AssertDevice(self, device):
"""Assert that the device identifier is the given string."""
- cmd = ('getprop("ro.product.device") == "%s" || '
+ cmd = ('get_device_compatible("%s") == "OK" || '
'abort("This package is for \\"%s\\" devices; '
'this is a \\"" + getprop("ro.product.device") + "\\".");'
) % (device, device)