1*4882a593SmuzhiyunFrom ddb9c5147883f8b27b4205450139e4a115d9961f Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Kyungjik Min <dp.min@lge.com> 3*4882a593SmuzhiyunDate: Mon, 28 Dec 2020 15:56:09 +0900 4*4882a593SmuzhiyunSubject: [PATCH] Fix linking error with ld-gold 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun:Release Notes: 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun:Detailed Notes: 9*4882a593Smuzhiyunhttps://github.com/protocolbuffers/protobuf/issues/6113 10*4882a593SmuzhiyunThere's a bug in the CMake build leading it to not use the version 11*4882a593Smuzhiyunscripts, which hides the problem (because all symbols are now public) 12*4882a593Smuzhiyunbut doesn't solve it properly. 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun:Testing Performed: 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun:QA Notes: 17*4882a593SmuzhiyunN/A 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun:Issues Addressed: 20*4882a593Smuzhiyun[PLAT-130467] Fix build error for libgoogleassistant with latest 21*4882a593Smuzhiyun protobuf-3.11.4 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun src/libprotobuf-lite.map | 2 ++ 24*4882a593Smuzhiyun src/libprotobuf.map | 2 ++ 25*4882a593Smuzhiyun src/libprotoc.map | 2 ++ 26*4882a593Smuzhiyun 3 files changed, 6 insertions(+) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map 29*4882a593Smuzhiyunindex 391554669..a1853ca6c 100644 30*4882a593Smuzhiyun--- a/src/libprotobuf-lite.map 31*4882a593Smuzhiyun+++ b/src/libprotobuf-lite.map 32*4882a593Smuzhiyun@@ -3,6 +3,8 @@ 33*4882a593Smuzhiyun extern "C++" { 34*4882a593Smuzhiyun *google*; 35*4882a593Smuzhiyun }; 36*4882a593Smuzhiyun+ scc_info_*; 37*4882a593Smuzhiyun+ descriptor_table_*; 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun local: 40*4882a593Smuzhiyun *; 41*4882a593Smuzhiyundiff --git a/src/libprotobuf.map b/src/libprotobuf.map 42*4882a593Smuzhiyunindex 391554669..a1853ca6c 100644 43*4882a593Smuzhiyun--- a/src/libprotobuf.map 44*4882a593Smuzhiyun+++ b/src/libprotobuf.map 45*4882a593Smuzhiyun@@ -3,6 +3,8 @@ 46*4882a593Smuzhiyun extern "C++" { 47*4882a593Smuzhiyun *google*; 48*4882a593Smuzhiyun }; 49*4882a593Smuzhiyun+ scc_info_*; 50*4882a593Smuzhiyun+ descriptor_table_*; 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun local: 53*4882a593Smuzhiyun *; 54*4882a593Smuzhiyundiff --git a/src/libprotoc.map b/src/libprotoc.map 55*4882a593Smuzhiyunindex 391554669..a1853ca6c 100644 56*4882a593Smuzhiyun--- a/src/libprotoc.map 57*4882a593Smuzhiyun+++ b/src/libprotoc.map 58*4882a593Smuzhiyun@@ -3,6 +3,8 @@ 59*4882a593Smuzhiyun extern "C++" { 60*4882a593Smuzhiyun *google*; 61*4882a593Smuzhiyun }; 62*4882a593Smuzhiyun+ scc_info_*; 63*4882a593Smuzhiyun+ descriptor_table_*; 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun local: 66*4882a593Smuzhiyun *; 67*4882a593Smuzhiyun-- 68*4882a593Smuzhiyun2.17.1 69*4882a593Smuzhiyun 70