Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard."
diff --git a/core/Makefile b/core/Makefile
index a183444..f64dc28 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -700,8 +700,8 @@
# format.
ifeq ($(AB_OTA_UPDATER),true)
ifeq ($(BRILLO),)
-ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_ETC)/security/update_engine/update-payload-key.pub.pem
-$(TARGET_OUT_ETC)/security/update_engine/update-payload-key.pub.pem: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR))
+ALL_DEFAULT_INSTALLED_MODULES += $(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem
+$(TARGET_OUT_ETC)/update_engine/update-payload-key.pub.pem: $(addsuffix .x509.pem,$(DEFAULT_KEY_CERT_PAIR))
$(hide) rm -f $@
$(hide) mkdir -p $(dir $@)
$(hide) openssl x509 -pubkey -noout -in $< > $@
diff --git a/core/binary.mk b/core/binary.mk
index ef47636..af8d747 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -907,6 +907,7 @@
endif
gen_asm_objects := $(gen_S_objects) $(gen_s_objects)
+$(gen_asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
###########################################################
## o: Include generated .o files in output.
@@ -1043,6 +1044,7 @@
endif
asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(asm_objects_S) $(asm_objects_s)
+$(asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
# .asm for x86/x86_64 needs to be compiled with yasm.
diff --git a/core/config.mk b/core/config.mk
index 1af1995..34be76b 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -406,6 +406,8 @@
DX := $(HOST_OUT_EXECUTABLES)/dx
MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
+USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
+
# Override the definitions above for unbundled and PDK builds
ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
prebuilt_sdk_tools := prebuilts/sdk/tools