commit b4863637a221ea8173e19ed61cc3654611c94c1f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 19 23:00:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 19 23:00:57 2021 +0000
tree c914eb65185e4c6aceb2749d238d9af661c6b6e4
parent 9dbecd650fb1709b2e073353ee6a8bb7ad339496
parent 064d91c49ba059dea8f6e980871a3e2e68c0af61

Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index b15ce84..2951c05 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2765,7 +2765,7 @@
 define _symlink-file
 $(3): $(1)
 	@echo "Symlink: $$@ -> $(2)"
-	@mkdir -p $(dir $$@)
+	@mkdir -p $$(dir $$@)
 	@rm -rf $$@
 	$(hide) ln -sf $(2) $$@
 $(3): .KATI_SYMLINK_OUTPUTS := $(3)

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 17176df..ec67560 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -240,7 +240,7 @@
 
 $(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
 
-$(call add_json_bool, CompressedApex, $(PRODUCT_COMPRESSED_APEX))
+$(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX)))
 
 $(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))
 

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index f4e5f4e..041298c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -111,7 +111,7 @@
     if [ "$BUILD_VAR_CACHE_READY" = "true" ]
     then
         eval "echo \"\${abs_var_cache_$1}\""
-    return
+        return
     fi
 
     local T=$(gettop)