am ced6159b: Merge "Filter out gcc flags that are not recognized by clang."
* commit 'ced6159b7e5551fcd3f64c21b7807c7555f80f73':
Filter out gcc flags that are not recognized by clang.
diff --git a/core/Makefile b/core/Makefile
index 2822146..10d8837 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1281,19 +1281,16 @@
$(BUILT_OTATOOLS_PACKAGE): \
zip_root := $(intermediate)/otatools
-otatools_lib_path := $(notdir $(HOST_OUT_SHARED_LIBRARIES))
$(BUILT_OTATOOLS_PACKAGE): \
- $(OTATOOLS) \
- $(HOST_OUT_SHARED_LIBRARIES)/libc++.so
+ $(OTATOOLS)
@echo "Package OTA tools: $@"
$(hide) rm -rf $@ $(zip_root)
- $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/$(otatools_lib_path)
+ $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools
$(hide) $(ACP) -p $(OTATOOLS) $(zip_root)/bin
$(hide) mv $(zip_root)/bin/*.jar $(zip_root)/framework/
- $(hide) $(ACP) $(HOST_OUT_SHARED_LIBRARIES)/libc++.so $(zip_root)/$(otatools_lib_path)
$(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools
$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
- $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools $(otatools_lib_path))
+ $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools)
$(hide) zip -qry $(abspath $@) build/target/product/security/
$(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem -o -name oem.prop | xargs zip -qry $(abspath $@)