Merge "Add emulated_apit_checker for Vulkan" into main
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
index a1c10f5..b22cc2a 100644
--- a/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@ -159,7 +159,6 @@
"tests/dumpstate_test.cpp",
],
static_libs: [
- "libc++fs",
"libgmock",
],
test_config: "dumpstate_test.xml",
diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 707b998..b63d14b 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -412,6 +412,14 @@
defaults: ["frameworks_native_data_etc_defaults"],
}
+// installed in system
+prebuilt_etc {
+ name: "android.software.preview_sdk.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.preview_sdk.xml",
+ filename_from_src: true,
+}
+
prebuilt_etc {
name: "android.software.sip.voip.prebuilt.xml",
src: "android.software.sip.voip.xml",
@@ -454,6 +462,22 @@
defaults: ["frameworks_native_data_etc_defaults"],
}
+// installed in system
+prebuilt_etc {
+ name: "android.software.webview.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.webview.xml",
+ filename_from_src: true,
+}
+
+// installed in system
+prebuilt_etc {
+ name: "android.software.window_magnification.prebuilt.xml",
+ relative_install_path: "permissions",
+ src: "android.software.window_magnification.xml",
+ filename_from_src: true,
+}
+
prebuilt_etc {
name: "aosp_excluded_hardware.prebuilt.xml",
src: "aosp_excluded_hardware.xml",
diff --git a/include/android/system_fonts.h b/include/android/system_fonts.h
index 94484ea..2d3a214 100644
--- a/include/android/system_fonts.h
+++ b/include/android/system_fonts.h
@@ -31,27 +31,27 @@
*
* \code{.cpp}
* ASystemFontIterator* iterator = ASystemFontIterator_open();
- * ASystemFont* font = NULL;
+ * AFont* font = NULL;
*
* while ((font = ASystemFontIterator_next(iterator)) != nullptr) {
* // Look if the font is your desired one.
- * if (ASystemFont_getWeight(font) == 400 && !ASystemFont_isItalic(font)
- * && ASystemFont_getLocale(font) == NULL) {
+ * if (AFont_getWeight(font) == 400 && !AFont_isItalic(font)
+ * && AFont_getLocale(font) == NULL) {
* break;
* }
- * ASystemFont_close(font);
+ * AFont_close(font);
* }
* ASystemFontIterator_close(iterator);
*
- * int fd = open(ASystemFont_getFontFilePath(font), O_RDONLY);
- * int collectionIndex = ASystemFont_getCollectionINdex(font);
+ * int fd = open(AFont_getFontFilePath(font), O_RDONLY | O_CLOEXEC);
+ * int collectionIndex = AFont_getCollectionIndex(font);
* std::vector<std::pair<uint32_t, float>> variationSettings;
- * for (size_t i = 0; i < ASystemFont_getAxisCount(font); ++i) {
+ * for (size_t i = 0; i < AFont_getAxisCount(font); ++i) {
* variationSettings.push_back(std::make_pair(
- * ASystemFont_getAxisTag(font, i),
- * ASystemFont_getAxisValue(font, i)));
+ * AFont_getAxisTag(font, i),
+ * AFont_getAxisValue(font, i)));
* }
- * ASystemFont_close(font);
+ * AFont_close(font);
*
* // Use this font for your text rendering engine.
*
@@ -99,7 +99,7 @@
/**
* Create a system font iterator.
*
- * Use ASystemFont_close() to close the iterator.
+ * Use ASystemFontIterator_close() to close the iterator.
*
* Available since API level 29.
*
@@ -123,7 +123,7 @@
*
* \param iterator an iterator for the system fonts. Passing NULL is not allowed.
* \return a font. If no more font is available, returns nullptr. You need to release the returned
- * font by ASystemFont_close when it is no longer needed.
+ * font with AFont_close() when it is no longer needed.
*/
AFont* _Nullable ASystemFontIterator_next(ASystemFontIterator* _Nonnull iterator) __INTRODUCED_IN(29);
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index f31f8d3..bd6a08e 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -268,6 +268,21 @@
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
+
+ target: {
+ bionic: {
+ // Hide symbols by default and set the BUILDING_LIBBINDER macro so that
+ // the code knows to export them.
+ //
+ // Only enabled on bionic builds, where RTTI is disabled, because
+ // it is failing to export required typeinfo symbols.
+ // TODO: b/341341056 - Find a solution for non-bionic builds.
+ cflags: [
+ "-fvisibility=hidden",
+ "-DBUILDING_LIBBINDER",
+ ],
+ },
+ },
}
cc_defaults {