From 7f97e8b232881b71901cdc0d141a01ae5afbdef9 Mon Sep 17 00:00:00 2001 From: Amir Shalem Date: Wed, 4 Dec 2019 01:32:14 -0800 Subject: [PATCH] Allow redex to optimize more of yoga by removing unneeded @DoNotStrip marks Summary: There are multiple `DoNotStrip` in Yoga java binding, they aren't needed. ##Changelog: [Internal][Yoga] Allow redex to optimize more of yoga by removing unneeded DoNotStrip marks Reviewed By: SidharthGuglani Differential Revision: D17519844 fbshipit-source-id: 8b26800d720f34cae87754d85460abf88acbe713 --- java/com/facebook/yoga/YogaAlign.java | 3 --- java/com/facebook/yoga/YogaBaselineFunction.java | 4 ---- java/com/facebook/yoga/YogaDimension.java | 3 --- java/com/facebook/yoga/YogaDirection.java | 3 --- java/com/facebook/yoga/YogaDisplay.java | 3 --- java/com/facebook/yoga/YogaEdge.java | 3 --- java/com/facebook/yoga/YogaExperimentalFeature.java | 3 --- java/com/facebook/yoga/YogaFlexDirection.java | 3 --- java/com/facebook/yoga/YogaJustify.java | 3 --- java/com/facebook/yoga/YogaLogLevel.java | 1 + java/com/facebook/yoga/YogaMeasureFunction.java | 4 ---- java/com/facebook/yoga/YogaMeasureMode.java | 3 --- java/com/facebook/yoga/YogaNodeType.java | 3 --- java/com/facebook/yoga/YogaOverflow.java | 3 --- java/com/facebook/yoga/YogaPositionType.java | 3 --- java/com/facebook/yoga/YogaPrintOptions.java | 3 --- java/com/facebook/yoga/YogaStyleInputs.java | 3 --- java/com/facebook/yoga/YogaUnit.java | 3 --- java/com/facebook/yoga/YogaWrap.java | 3 --- 19 files changed, 1 insertion(+), 56 deletions(-) diff --git a/java/com/facebook/yoga/YogaAlign.java b/java/com/facebook/yoga/YogaAlign.java index afeaa500..82c6cbfb 100644 --- a/java/com/facebook/yoga/YogaAlign.java +++ b/java/com/facebook/yoga/YogaAlign.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaAlign { AUTO(0), FLEX_START(1), diff --git a/java/com/facebook/yoga/YogaBaselineFunction.java b/java/com/facebook/yoga/YogaBaselineFunction.java index a859aff4..dbd405c6 100644 --- a/java/com/facebook/yoga/YogaBaselineFunction.java +++ b/java/com/facebook/yoga/YogaBaselineFunction.java @@ -7,14 +7,10 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public interface YogaBaselineFunction { /** * Return the baseline of the node in points. When no baseline function is set the baseline * default to the computed height of the node. */ - @DoNotStrip float baseline(YogaNode node, float width, float height); } diff --git a/java/com/facebook/yoga/YogaDimension.java b/java/com/facebook/yoga/YogaDimension.java index 77ff6caa..cebcdc47 100644 --- a/java/com/facebook/yoga/YogaDimension.java +++ b/java/com/facebook/yoga/YogaDimension.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaDimension { WIDTH(0), HEIGHT(1); diff --git a/java/com/facebook/yoga/YogaDirection.java b/java/com/facebook/yoga/YogaDirection.java index e18ee9fa..4e75d303 100644 --- a/java/com/facebook/yoga/YogaDirection.java +++ b/java/com/facebook/yoga/YogaDirection.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaDirection { INHERIT(0), LTR(1), diff --git a/java/com/facebook/yoga/YogaDisplay.java b/java/com/facebook/yoga/YogaDisplay.java index e69d74b3..76cbfd77 100644 --- a/java/com/facebook/yoga/YogaDisplay.java +++ b/java/com/facebook/yoga/YogaDisplay.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaDisplay { FLEX(0), NONE(1); diff --git a/java/com/facebook/yoga/YogaEdge.java b/java/com/facebook/yoga/YogaEdge.java index e60ffd88..cba17934 100644 --- a/java/com/facebook/yoga/YogaEdge.java +++ b/java/com/facebook/yoga/YogaEdge.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaEdge { LEFT(0), TOP(1), diff --git a/java/com/facebook/yoga/YogaExperimentalFeature.java b/java/com/facebook/yoga/YogaExperimentalFeature.java index 8eb1bd2a..76525eab 100644 --- a/java/com/facebook/yoga/YogaExperimentalFeature.java +++ b/java/com/facebook/yoga/YogaExperimentalFeature.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaExperimentalFeature { WEB_FLEX_BASIS(0); diff --git a/java/com/facebook/yoga/YogaFlexDirection.java b/java/com/facebook/yoga/YogaFlexDirection.java index c844074e..83060e13 100644 --- a/java/com/facebook/yoga/YogaFlexDirection.java +++ b/java/com/facebook/yoga/YogaFlexDirection.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaFlexDirection { COLUMN(0), COLUMN_REVERSE(1), diff --git a/java/com/facebook/yoga/YogaJustify.java b/java/com/facebook/yoga/YogaJustify.java index 3508e17d..3d39015e 100644 --- a/java/com/facebook/yoga/YogaJustify.java +++ b/java/com/facebook/yoga/YogaJustify.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaJustify { FLEX_START(0), CENTER(1), diff --git a/java/com/facebook/yoga/YogaLogLevel.java b/java/com/facebook/yoga/YogaLogLevel.java index 57cb4aa0..f6a84023 100644 --- a/java/com/facebook/yoga/YogaLogLevel.java +++ b/java/com/facebook/yoga/YogaLogLevel.java @@ -28,6 +28,7 @@ public enum YogaLogLevel { return mIntValue; } + @DoNotStrip public static YogaLogLevel fromInt(int value) { switch (value) { case 0: return ERROR; diff --git a/java/com/facebook/yoga/YogaMeasureFunction.java b/java/com/facebook/yoga/YogaMeasureFunction.java index 335c4c79..8b8533ba 100644 --- a/java/com/facebook/yoga/YogaMeasureFunction.java +++ b/java/com/facebook/yoga/YogaMeasureFunction.java @@ -7,14 +7,10 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public interface YogaMeasureFunction { /** * Return a value created by YogaMeasureOutput.make(width, height); */ - @DoNotStrip long measure( YogaNode node, float width, diff --git a/java/com/facebook/yoga/YogaMeasureMode.java b/java/com/facebook/yoga/YogaMeasureMode.java index dbfd22c7..848d4aa7 100644 --- a/java/com/facebook/yoga/YogaMeasureMode.java +++ b/java/com/facebook/yoga/YogaMeasureMode.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaMeasureMode { UNDEFINED(0), EXACTLY(1), diff --git a/java/com/facebook/yoga/YogaNodeType.java b/java/com/facebook/yoga/YogaNodeType.java index 8d45d6ae..4386bf38 100644 --- a/java/com/facebook/yoga/YogaNodeType.java +++ b/java/com/facebook/yoga/YogaNodeType.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaNodeType { DEFAULT(0), TEXT(1); diff --git a/java/com/facebook/yoga/YogaOverflow.java b/java/com/facebook/yoga/YogaOverflow.java index 0e75106e..90c97881 100644 --- a/java/com/facebook/yoga/YogaOverflow.java +++ b/java/com/facebook/yoga/YogaOverflow.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaOverflow { VISIBLE(0), HIDDEN(1), diff --git a/java/com/facebook/yoga/YogaPositionType.java b/java/com/facebook/yoga/YogaPositionType.java index 23c2786f..00354f5c 100644 --- a/java/com/facebook/yoga/YogaPositionType.java +++ b/java/com/facebook/yoga/YogaPositionType.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaPositionType { RELATIVE(0), ABSOLUTE(1); diff --git a/java/com/facebook/yoga/YogaPrintOptions.java b/java/com/facebook/yoga/YogaPrintOptions.java index bc0c2de0..9a7f02ec 100644 --- a/java/com/facebook/yoga/YogaPrintOptions.java +++ b/java/com/facebook/yoga/YogaPrintOptions.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaPrintOptions { LAYOUT(1), STYLE(2), diff --git a/java/com/facebook/yoga/YogaStyleInputs.java b/java/com/facebook/yoga/YogaStyleInputs.java index dc26bad8..21ca2803 100644 --- a/java/com/facebook/yoga/YogaStyleInputs.java +++ b/java/com/facebook/yoga/YogaStyleInputs.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public class YogaStyleInputs { public static final short LAYOUT_DIRECTION = 0; public static final short FLEX_DIRECTION = 1; diff --git a/java/com/facebook/yoga/YogaUnit.java b/java/com/facebook/yoga/YogaUnit.java index d43c8ff1..5a7e5e66 100644 --- a/java/com/facebook/yoga/YogaUnit.java +++ b/java/com/facebook/yoga/YogaUnit.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaUnit { UNDEFINED(0), POINT(1), diff --git a/java/com/facebook/yoga/YogaWrap.java b/java/com/facebook/yoga/YogaWrap.java index 23af8a40..7ad00568 100644 --- a/java/com/facebook/yoga/YogaWrap.java +++ b/java/com/facebook/yoga/YogaWrap.java @@ -7,9 +7,6 @@ package com.facebook.yoga; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip public enum YogaWrap { NO_WRAP(0), WRAP(1),