Merge "Add binder_sdk_test to postsubmit" into main
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index b63d14b..ab09de1 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -370,6 +370,14 @@
defaults: ["frameworks_native_data_etc_defaults"],
}
+// installed in system for GSI
+prebuilt_etc {
+ name: "android.software.credentials.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.credentials.xml",
+ filename_from_src: true,
+}
+
prebuilt_etc {
name: "android.software.device_id_attestation.prebuilt.xml",
src: "android.software.device_id_attestation.xml",
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 87026bb..55161a5 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -266,7 +266,20 @@
"-Wunused-const-variable",
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
+ // Hide symbols by default and set the BUILDING_LIBBINDER macro so that
+ // the code knows to export them.
+ "-fvisibility=hidden",
+ "-DBUILDING_LIBBINDER",
],
+
+ target: {
+ vendor: {
+ // Trimming the exported symbols reveals a bug in vendor code, so
+ // disable it for the vendor variant for now. http://b/349657329
+ // TODO: Fix the issue and remove this override.
+ cflags: ["-fvisibility=default"],
+ },
+ },
}
cc_defaults {
diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 5b5afd3..b1a287f 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -383,6 +383,14 @@
// before using cnx->major & cnx->minor
if (major != nullptr) *major = cnx->major;
if (minor != nullptr) *minor = cnx->minor;
+ auto mergeExtensionStrings = [](const std::vector<std::string>& strings) {
+ std::ostringstream combinedStringStream;
+ std::copy(strings.begin(), strings.end(),
+ std::ostream_iterator<std::string>(combinedStringStream, " "));
+ // gBuiltinExtensionString already has a trailing space so is added here
+ return gBuiltinExtensionString + combinedStringStream.str();
+ };
+ mExtensionString = mergeExtensionStrings(extensionStrings);
}
{ // scope for refLock
@@ -391,14 +399,6 @@
refCond.notify_all();
}
- auto mergeExtensionStrings = [](const std::vector<std::string>& strings) {
- std::ostringstream combinedStringStream;
- std::copy(strings.begin(), strings.end(),
- std::ostream_iterator<std::string>(combinedStringStream, " "));
- // gBuiltinExtensionString already has a trailing space so is added here
- return gBuiltinExtensionString + combinedStringStream.str();
- };
- mExtensionString = mergeExtensionStrings(extensionStrings);
return EGL_TRUE;
}