Merge "Remove USE_HWC2 usage" am: 8757179e52

am: 70a2813e86

Change-Id: Ida5cf0bb3a644e29c9216fabb89670bf4ec58220

libs/hwui/Android.bp

@@ -45,9 +45,6 @@ cc_defaults {
     ],
 
     product_variables: {
-        device_uses_hwc2: {
-            cflags: ["-DUSE_HWC2"],
-        },
         eng: {
             lto: {
                 never: true,

libs/hwui/JankTracker.cpp

@@ -81,7 +81,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
@@ -95,7 +94,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);
 }