Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I0eb3c216a79482373bfdaa0552e994af84873f5e
diff --git a/LibParameter.mk b/LibParameter.mk
index 42084d5..b648f09 100644
--- a/LibParameter.mk
+++ b/LibParameter.mk
@@ -136,6 +136,7 @@
LOCAL_CPPFLAGS := \
-frtti -fexceptions \
-Wno-instantiation-after-specialization \
+ -Wno-implicit-fallthrough \
LOCAL_STATIC_LIBRARIES := \
libpfw_utility$(SUFFIX) \
diff --git a/LibRemoteProcessor.mk b/LibRemoteProcessor.mk
index 320857d..90a344e 100644
--- a/LibRemoteProcessor.mk
+++ b/LibRemoteProcessor.mk
@@ -65,3 +65,5 @@
-isystem $(LOCAL_PATH)/asio/include
endif #ifeq ($(PFW_NETWORKING),false)
+
+LOCAL_CFLAGS += -Wno-implicit-fallthrough
diff --git a/TestPlatform.mk b/TestPlatform.mk
index 82d0842..66861b5 100644
--- a/TestPlatform.mk
+++ b/TestPlatform.mk
@@ -61,4 +61,4 @@
endif #ifeq ($(PFW_NETWORKING),false)
-LOCAL_CFLAGS += -Wall -Werror
+LOCAL_CFLAGS += -Wall -Werror -Wno-implicit-fallthrough
diff --git a/support/android/build_pfw_settings.mk b/support/android/build_pfw_settings.mk
index 271afbc..35fc4c3 100644
--- a/support/android/build_pfw_settings.mk
+++ b/support/android/build_pfw_settings.mk
@@ -42,7 +42,7 @@
$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(HOST_OUT)/bin/domainGenerator.py
$(hide) mkdir -p "$(dir $@)"
- "$(MY_TOOL)" --validate \
+ PATH=$(HOST_OUT_EXECUTABLES):$$PATH "$(MY_TOOL)" --validate \
--toplevel-config "$(MY_TOPLEVEL_FILE)" \
--criteria "$(MY_CRITERIA_FILE)" \
--initial-settings $(MY_TUNING_FILE) \
