Merge "Create graphics composer service for pps socket" into qt-qpr1-dev am: dd060ff0fd
Change-Id: If22c790a9444ece787a5e54f704f3e696b1daf3d
diff --git a/display_defaults.go b/display_defaults.go
index 84d06df..2a32280 100644
--- a/display_defaults.go
+++ b/display_defaults.go
@@ -1,8 +1,8 @@
package display
import (
- "android/soong/android"
- "android/soong/cc"
+ "android/soong/android"
+ "android/soong/cc"
"github.com/google/blueprint/proptools"
)
@@ -11,7 +11,7 @@
android.RegisterModuleType("display_go_defaults_sm7150", display_DefaultsFactory)
}
-func display_DefaultsFactory() (android.Module) {
+func display_DefaultsFactory() android.Module {
module := cc.DefaultsFactory()
android.AddLoadHook(module, display_Defaults)
return module
@@ -26,7 +26,7 @@
ctx.AppendProperties(p)
}
-func display_globalDefaults(ctx android.BaseContext) (*bool) {
+func display_globalDefaults(ctx android.LoadHookContext) *bool {
var module_enabled *bool
if android.ExistentPathForSource(ctx, "vendor/qcom/sm7150/codeaurora/commonsys-intf/display/Android.bp").Valid() == false {
@@ -35,4 +35,3 @@
return module_enabled
}
-
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 9ad44e5..3a800ad 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -41,8 +41,8 @@
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) \
- system/core/libion/include \
- system/core/libion/kernel-headers \
+ system/memory/libion/include \
+ system/memory/libion/kernel-headers \
$(kernel_includes)
LOCAL_HEADER_LIBRARIES := display_headers
