DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Ifffb4ff1d7c84e8288fcb11be490add07c6ccd6f
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..79ec05d
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+spyffe@google.com
+yichichen@google.com
+salidoa@google.com
diff --git a/libdebug/Android.mk b/libdebug/Android.mk
index e975a22..14e5de0 100644
--- a/libdebug/Android.mk
+++ b/libdebug/Android.mk
@@ -8,7 +8,5 @@
LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -std=c++11 -Werror -fno-operator-names
LOCAL_CLANG := true
LOCAL_SRC_FILES := debug_handler.cpp
-LOCAL_COPY_HEADERS_TO := qcom/display
-LOCAL_COPY_HEADERS := debug_handler.h
include $(BUILD_SHARED_LIBRARY)
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 3aab819..d561d49 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -31,6 +31,9 @@
LOCAL_SHARED_LIBRARIES += vendor.display.config@1.1
endif
+# Allow implicit fallthroughs in hwc_display.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES := hwc_session.cpp \
hwc_session_services.cpp \
hwc_display.cpp \
