From 6327893b9b4f508fe3527c54c0b1c5bdca00c2ee Mon Sep 17 00:00:00 2001
From: Sidharth Guglani <sidharthguglani@fb.com>
Date: Fri, 1 Nov 2019 11:45:19 -0700
Subject: [PATCH] Use compiler flags -ffunction-sections, -fdata-sections and
 gc sections in both jni and core

Summary: Use compiler flags -ffunction-sections, -fdata-sections and  -Wl,--gc-sections  in both jni and yoga core

Reviewed By: amir-shalem

Differential Revision: D18029671

fbshipit-source-id: 5192fb6d682248b16781dead0d7b0a0377861fb6
---
 CMakeLists.txt                     | 2 ++
 java/BUCK                          | 2 ++
 java/CMakeLists.txt                | 4 +++-
 tools/build_defs/oss/yoga_defs.bzl | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e8c12c..018c269f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ add_compile_options(
     -fno-omit-frame-pointer
     -fexceptions
     -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
     -Wall
     -std=c++11)
 
diff --git a/java/BUCK b/java/BUCK
index 6faa4d8b..5057aa56 100644
--- a/java/BUCK
+++ b/java/BUCK
@@ -26,6 +26,8 @@ yoga_cxx_library(
         "-fno-omit-frame-pointer",
         "-fexceptions",
         "-fvisibility=hidden",
+        "-ffunction-sections",
+        "-fdata-sections",
         "-fPIC",
         "-Wall",
         "-Werror",
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 7d61bce7..4a3dcd86 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -25,6 +25,8 @@ add_compile_options(
     -fno-omit-frame-pointer
     -fexceptions
     -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
     -Wall
     -std=c++11)
 
@@ -37,4 +39,4 @@ target_include_directories(yoga PRIVATE
     ${libfb_DIR}/include
     ${yogacore_DIR})
 
-target_link_libraries(yoga yogacore fb)
+target_link_libraries(yoga -Wl,--gc-sections yogacore fb)
diff --git a/tools/build_defs/oss/yoga_defs.bzl b/tools/build_defs/oss/yoga_defs.bzl
index a1ca965f..4c50e984 100644
--- a/tools/build_defs/oss/yoga_defs.bzl
+++ b/tools/build_defs/oss/yoga_defs.bzl
@@ -54,6 +54,8 @@ BASE_COMPILER_FLAGS = [
     "-fno-omit-frame-pointer",
     "-fexceptions",
     "-fvisibility=hidden",
+    "-ffunction-sections",
+    "-fdata-sections",
     "-Wall",
     "-Werror",
     "-O2",