diff options
| author | John Reck <jreck@google.com> | 2018-11-28 17:30:15 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-28 17:30:15 -0800 |
| commit | 820f382b9e04a0593f53ee3d0b3a9708738f95ad (patch) | |
| tree | 9ed3a637b7ffde8fcac1ef5d8afb3abb82ca3f25 | |
| parent | 7a96ccdb097333e266e2f79309dac82eaee79991 (diff) | |
| parent | 0ff158799a46a9c468e6a6e67a570d197183564c (diff) | |
Merge "Remove USE_HWC2 usage" am: 8757179e52 am: 70a2813e86
am: 0ff158799a
Change-Id: I8e87f4661e51b422886c72ef506f196608a32a42
| -rw-r--r-- | libs/hwui/Android.bp | 3 | ||||
| -rw-r--r-- | libs/hwui/JankTracker.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 17d2db71ab58..4a5b61a2d6cd 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -45,9 +45,6 @@ cc_defaults { ], product_variables: { - device_uses_hwc2: { - cflags: ["-DUSE_HWC2"], - }, eng: { lto: { never: true, diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp index e7ae7675f0b8..ccbb6c10d3af 100644 --- a/libs/hwui/JankTracker.cpp +++ b/libs/hwui/JankTracker.cpp @@ -82,7 +82,6 @@ static FrameInfoIndex sFrameStart = FrameInfoIndex::IntendedVsync; JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& displayInfo) { mGlobalData = globalData; nsecs_t frameIntervalNanos = static_cast<nsecs_t>(1_s / displayInfo.fps); -#if USE_HWC2 nsecs_t sfOffset = frameIntervalNanos - (displayInfo.presentationDeadline - 1_ms); nsecs_t offsetDelta = sfOffset - displayInfo.appVsyncOffset; // There are two different offset cases. If the offsetDelta is positive @@ -96,7 +95,6 @@ JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& di // return due to the staggering of VSYNC-app & VSYNC-sf. mDequeueTimeForgiveness = offsetDelta + 4_ms; } -#endif setFrameInterval(frameIntervalNanos); } |