From c31df519e020a38cfb8d75797b4931c1395f23f0 Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Mon, 28 Nov 2016 09:20:59 -0800 Subject: [PATCH] Dont strip class names referenced from native Summary: Ensure we don't strip classes used from native Reviewed By: lexs Differential Revision: D4237790 fbshipit-source-id: 1bd0780d965efbb8334917011ffd65896670ece1 --- enums.py | 2 ++ java/com/facebook/csslayout/CSSAlign.java | 3 +++ java/com/facebook/csslayout/CSSDimension.java | 3 +++ java/com/facebook/csslayout/CSSDirection.java | 3 +++ java/com/facebook/csslayout/CSSEdge.java | 3 +++ java/com/facebook/csslayout/CSSExperimentalFeature.java | 3 +++ java/com/facebook/csslayout/CSSFlexDirection.java | 3 +++ java/com/facebook/csslayout/CSSJustify.java | 3 +++ java/com/facebook/csslayout/CSSLogLevel.java | 3 +++ java/com/facebook/csslayout/CSSLogger.java | 1 + java/com/facebook/csslayout/CSSMeasureMode.java | 3 +++ java/com/facebook/csslayout/CSSNode.java | 1 + java/com/facebook/csslayout/CSSOverflow.java | 3 +++ java/com/facebook/csslayout/CSSPositionType.java | 3 +++ java/com/facebook/csslayout/CSSPrintOptions.java | 3 +++ java/com/facebook/csslayout/CSSWrap.java | 3 +++ 16 files changed, 43 insertions(+) diff --git a/enums.py b/enums.py index 5e361b9e..22e1b0ff 100644 --- a/enums.py +++ b/enums.py @@ -135,6 +135,8 @@ for name, values in ENUMS.items(): with open(root + '/java/com/facebook/csslayout/%s.java' % name, 'w') as f: f.write(LICENSE) f.write('package com.facebook.csslayout;\n\n') + f.write('import com.facebook.proguard.annotations.DoNotStrip;\n\n') + f.write('@DoNotStrip\n') f.write('public enum %s {\n' % name) if len(values) > 0: for value in values: diff --git a/java/com/facebook/csslayout/CSSAlign.java b/java/com/facebook/csslayout/CSSAlign.java index 2dedee0b..4f4af8cb 100644 --- a/java/com/facebook/csslayout/CSSAlign.java +++ b/java/com/facebook/csslayout/CSSAlign.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSAlign { AUTO(0), FLEX_START(1), diff --git a/java/com/facebook/csslayout/CSSDimension.java b/java/com/facebook/csslayout/CSSDimension.java index e3fde021..77785ea6 100644 --- a/java/com/facebook/csslayout/CSSDimension.java +++ b/java/com/facebook/csslayout/CSSDimension.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSDimension { WIDTH(0), HEIGHT(1); diff --git a/java/com/facebook/csslayout/CSSDirection.java b/java/com/facebook/csslayout/CSSDirection.java index c0e84f1a..38916ea5 100644 --- a/java/com/facebook/csslayout/CSSDirection.java +++ b/java/com/facebook/csslayout/CSSDirection.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSDirection { INHERIT(0), LTR(1), diff --git a/java/com/facebook/csslayout/CSSEdge.java b/java/com/facebook/csslayout/CSSEdge.java index 50d184e3..8fe6a2fb 100644 --- a/java/com/facebook/csslayout/CSSEdge.java +++ b/java/com/facebook/csslayout/CSSEdge.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSEdge { LEFT(0), TOP(1), diff --git a/java/com/facebook/csslayout/CSSExperimentalFeature.java b/java/com/facebook/csslayout/CSSExperimentalFeature.java index d9476e81..3489e919 100644 --- a/java/com/facebook/csslayout/CSSExperimentalFeature.java +++ b/java/com/facebook/csslayout/CSSExperimentalFeature.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSExperimentalFeature { ROUNDING(0), WEB_FLEX_BASIS(1); diff --git a/java/com/facebook/csslayout/CSSFlexDirection.java b/java/com/facebook/csslayout/CSSFlexDirection.java index 10e5cd6a..3047516d 100644 --- a/java/com/facebook/csslayout/CSSFlexDirection.java +++ b/java/com/facebook/csslayout/CSSFlexDirection.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSFlexDirection { COLUMN(0), COLUMN_REVERSE(1), diff --git a/java/com/facebook/csslayout/CSSJustify.java b/java/com/facebook/csslayout/CSSJustify.java index 2d36a85f..2c9abc6b 100644 --- a/java/com/facebook/csslayout/CSSJustify.java +++ b/java/com/facebook/csslayout/CSSJustify.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSJustify { FLEX_START(0), CENTER(1), diff --git a/java/com/facebook/csslayout/CSSLogLevel.java b/java/com/facebook/csslayout/CSSLogLevel.java index 94551bc0..9d54b1eb 100644 --- a/java/com/facebook/csslayout/CSSLogLevel.java +++ b/java/com/facebook/csslayout/CSSLogLevel.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSLogLevel { ERROR(0), WARN(1), diff --git a/java/com/facebook/csslayout/CSSLogger.java b/java/com/facebook/csslayout/CSSLogger.java index f1f28fe2..d270e39f 100644 --- a/java/com/facebook/csslayout/CSSLogger.java +++ b/java/com/facebook/csslayout/CSSLogger.java @@ -15,6 +15,7 @@ import com.facebook.proguard.annotations.DoNotStrip; * Inteface for recieving logs from native layer. Use by setting CSSNode.setLogger(myLogger); * See CSSLogLevel for the different log levels. */ +@DoNotStrip public interface CSSLogger { @DoNotStrip void log(CSSLogLevel level, String message); diff --git a/java/com/facebook/csslayout/CSSMeasureMode.java b/java/com/facebook/csslayout/CSSMeasureMode.java index d2c69e6f..5b14c7dd 100644 --- a/java/com/facebook/csslayout/CSSMeasureMode.java +++ b/java/com/facebook/csslayout/CSSMeasureMode.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSMeasureMode { UNDEFINED(0), EXACTLY(1), diff --git a/java/com/facebook/csslayout/CSSNode.java b/java/com/facebook/csslayout/CSSNode.java index d1943e9c..309a4975 100644 --- a/java/com/facebook/csslayout/CSSNode.java +++ b/java/com/facebook/csslayout/CSSNode.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; +@DoNotStrip public class CSSNode implements CSSNodeAPI { static { diff --git a/java/com/facebook/csslayout/CSSOverflow.java b/java/com/facebook/csslayout/CSSOverflow.java index 8ba708ae..df6bedd7 100644 --- a/java/com/facebook/csslayout/CSSOverflow.java +++ b/java/com/facebook/csslayout/CSSOverflow.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSOverflow { VISIBLE(0), HIDDEN(1), diff --git a/java/com/facebook/csslayout/CSSPositionType.java b/java/com/facebook/csslayout/CSSPositionType.java index 4dcaa0df..01eeece6 100644 --- a/java/com/facebook/csslayout/CSSPositionType.java +++ b/java/com/facebook/csslayout/CSSPositionType.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSPositionType { RELATIVE(0), ABSOLUTE(1); diff --git a/java/com/facebook/csslayout/CSSPrintOptions.java b/java/com/facebook/csslayout/CSSPrintOptions.java index ec83ab47..49cbc25e 100644 --- a/java/com/facebook/csslayout/CSSPrintOptions.java +++ b/java/com/facebook/csslayout/CSSPrintOptions.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSPrintOptions { LAYOUT(1), STYLE(2), diff --git a/java/com/facebook/csslayout/CSSWrap.java b/java/com/facebook/csslayout/CSSWrap.java index 69a59056..52a7aaf8 100644 --- a/java/com/facebook/csslayout/CSSWrap.java +++ b/java/com/facebook/csslayout/CSSWrap.java @@ -9,6 +9,9 @@ package com.facebook.csslayout; +import com.facebook.proguard.annotations.DoNotStrip; + +@DoNotStrip public enum CSSWrap { NO_WRAP(0), WRAP(1);