Merge "Remove verity blocks from care map"
diff --git a/core/Makefile b/core/Makefile
index b31758e..c24bbe2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1758,6 +1758,7 @@
$(HOST_LIBRARY_PATH)/libext2_blkid-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libext2_com_err-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libext2_e2p-host$(HOST_SHLIB_SUFFIX) \
+ $(HOST_LIBRARY_PATH)/libext2_misc$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libext2_profile-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libext2_quota-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libext2_uuid-host$(HOST_SHLIB_SUFFIX) \
@@ -1770,6 +1771,7 @@
$(HOST_LIBRARY_PATH)/libprotobuf-cpp-lite$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libssl-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libz-host$(HOST_SHLIB_SUFFIX) \
+ $(HOST_LIBRARY_PATH)/libsparse-host$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libbase$(HOST_SHLIB_SUFFIX) \
$(HOST_LIBRARY_PATH)/libpcre2$(HOST_SHLIB_SUFFIX)
@@ -2195,7 +2197,7 @@
$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)
$(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED) $(dir $(PRIVATE_LIST_FILE))
$(hide) find $(TARGET_OUT_UNSTRIPPED) | sort >$(PRIVATE_LIST_FILE)
- $(hide) $(SOONG_ZIP) -d -o $@ -C . -l $(PRIVATE_LIST_FILE)
+ $(hide) $(SOONG_ZIP) -d -o $@ -C $(OUT_DIR)/.. -l $(PRIVATE_LIST_FILE)
# -----------------------------------------------------------------
# A zip of the coverage directory.
#
diff --git a/core/clang/versions.mk b/core/clang/versions.mk
index d9c8aab..abed69b 100644
--- a/core/clang/versions.mk
+++ b/core/clang/versions.mk
@@ -1,3 +1,4 @@
## Clang/LLVM release versions.
-LLVM_PREBUILTS_VERSION ?= clang-3289846
+LLVM_PREBUILTS_VERSION ?= clang-3688880
+LLVM_PREBUILTS_BASE ?= prebuilts/clang/host
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 9585eb0..c94abc3 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -69,6 +69,7 @@
lmkd \
logcat \
logwrapper \
+ lshal \
mkshrc \
reboot \
recovery \
@@ -86,13 +87,14 @@
file_contexts.bin \
nonplat_file_contexts \
nonplat_mac_permissions.xml \
+ nonplat_property_contexts \
nonplat_seapp_contexts \
nonplat_service_contexts \
plat_file_contexts \
plat_mac_permissions.xml \
+ plat_property_contexts \
plat_seapp_contexts \
plat_service_contexts \
- property_contexts \
selinux_version \
sepolicy
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 7310470..bd033eb 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1418,7 +1418,8 @@
# Open the signed zip. Compute the metadata that's needed for streaming.
output_zip = zipfile.ZipFile(temp_signing, "a",
compression=zipfile.ZIP_DEFLATED)
- metadata['streaming-property-files'] = ComputeStreamingMetadata(output_zip)
+ metadata['ota-streaming-property-files'] = ComputeStreamingMetadata(
+ output_zip)
# Write the metadata entry into the zip.
WriteMetadata(metadata, output_zip)
@@ -1432,7 +1433,7 @@
# Reopen the signed zip to double check the streaming metadata.
output_zip = zipfile.ZipFile(output_file, "r")
- assert (metadata['streaming-property-files'] ==
+ assert (metadata['ota-streaming-property-files'] ==
ComputeStreamingMetadata(output_zip)), \
"Mismatching streaming metadata."
common.ZipClose(output_zip)