commit a06d5754b341d55710d3d1922f76d9802987ae7a
author Yu Liu <yudiliu@google.com> Fri Sep 23 19:06:29 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 23 19:06:29 2022 +0000
tree ccd7412c7f3a991044a61ac177bdaf8ed0c05f07
parent 1c2559066acba9080ae762ff1a0b5a4c5de6045e
parent 1a8094363008b8ef7b3c60d4f33735c5c99b81c6

Merge "Explicitly list the static libs for exclude-libs flag." am: b3f0aab014 am: 0b0b629b60 am: 89ea7b26fa am: 18c4f489f1 am: 1a80943630

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2227218

Change-Id: I74597f6bb8c738531248224d9987a8edece64e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

opengl/libs/Android.bp

diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index c1e935a..2237d2d 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -170,7 +170,11 @@
         "libEGL_getProcAddress",
         "libEGL_blobCache",
     ],
-    ldflags: ["-Wl,--exclude-libs=ALL,--Bsymbolic-functions"],
+    ldflags: [
+        "-Wl,--exclude-libs=libEGL_getProcAddress.a",
+        "-Wl,--exclude-libs=libEGL_blobCache.a",
+        "-Wl,--Bsymbolic-functions",
+    ],
     export_include_dirs: ["EGL/include"],
     stubs: {
         symbol_file: "libEGL.map.txt",