Merge changes from topic 'drvup-master'
* changes:
dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH
Make dlext_namespaces.h available to users of libnativeloader
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index 051acfa..8d5b51b 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -27,7 +27,6 @@
$(LOCAL_PATH)/include \
system/vold \
system/extras/ext4_utils \
- external/openssl/include \
bootable/recovery
LOCAL_MODULE:= libfs_mgr
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
diff --git a/include/system/window.h b/include/system/window.h
index abd3282..236de8d 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -1027,14 +1027,16 @@
static inline int native_window_get_frame_timestamps(
struct ANativeWindow* window, uint32_t framesAgo,
int64_t* outRequestedPresentTime, int64_t* outAcquireTime,
- int64_t* outRefreshStartTime, int64_t* outGlCompositionDoneTime,
+ int64_t* outLatchTime, int64_t* outFirstRefreshStartTime,
+ int64_t* outLastRefreshStartTime, int64_t* outGlCompositionDoneTime,
int64_t* outDisplayPresentTime, int64_t* outDisplayRetireTime,
- int64_t* outReleaseTime)
+ int64_t* outDequeueReadyTime, int64_t* outReleaseTime)
{
return window->perform(window, NATIVE_WINDOW_GET_FRAME_TIMESTAMPS,
- framesAgo, outRequestedPresentTime, outAcquireTime,
- outRefreshStartTime, outGlCompositionDoneTime,
- outDisplayPresentTime, outDisplayRetireTime, outReleaseTime);
+ framesAgo, outRequestedPresentTime, outAcquireTime, outLatchTime,
+ outFirstRefreshStartTime, outLastRefreshStartTime,
+ outGlCompositionDoneTime, outDisplayPresentTime,
+ outDisplayRetireTime, outDequeueReadyTime, outReleaseTime);
}