Merge "Update OWNERS file for opengl and vulkan"
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 8af2872..f3d4b7e 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -102,9 +102,6 @@
android: {
srcs: libbinder_device_interface_sources,
},
- host: {
- cflags: ["-D__ANDROID_HOST__"],
- },
vendor: {
exclude_srcs: libbinder_device_interface_sources,
},
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index b6f3d7b..f3e8f45 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -30,7 +30,7 @@
#include <binder/IPermissionController.h>
#endif
-#ifndef __ANDROID_HOST__
+#ifdef __ANDROID__
#include <cutils/properties.h>
#endif
@@ -63,7 +63,7 @@
return gDefaultServiceManager;
}
-#if !defined(__ANDROID_VNDK__) && !defined(__ANDROID_HOST__)
+#if !defined(__ANDROID_VNDK__) && defined(__ANDROID__)
// IPermissionController is not accessible to vendors
bool checkCallingPermission(const String16& permission)
@@ -166,14 +166,14 @@
const bool isVendorService =
strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;
const long timeout = uptimeMillis() + 5000;
+ // Vendor code can't access system properties
if (!gSystemBootCompleted && !isVendorService) {
-#ifdef __ANDROID_HOST__
- gSystemBootCompleted = true;
-#else
- // Vendor code can't access system properties
+#ifdef __ANDROID__
char bootCompleted[PROPERTY_VALUE_MAX];
property_get("sys.boot_completed", bootCompleted, "0");
gSystemBootCompleted = strcmp(bootCompleted, "1") == 0 ? true : false;
+#else
+ gSystemBootCompleted = true;
#endif
}
// retry interval in millisecond; note that vendor services stay at 100ms
diff --git a/libs/binder/include/private/binder/binder_module.h b/libs/binder/include/private/binder/binder_module.h
index 09e6ba0..c22be9f 100644
--- a/libs/binder/include/private/binder/binder_module.h
+++ b/libs/binder/include/private/binder/binder_module.h
@@ -24,7 +24,7 @@
/* obtain structures and constants from the kernel header */
// TODO(b/31559095): bionic on host
-#ifdef __ANDROID_HOST__
+#ifndef __ANDROID__
#define __packed __attribute__((__packed__))
#endif
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 8512471..62a0f9f 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -68,10 +68,17 @@
"jni_headers",
],
- version_script: "libbinder_ndk.map.txt",
+ target: {
+ linux: {
+ version_script: "libbinder_ndk.map.txt",
+ },
+ },
stubs: {
symbol_file: "libbinder_ndk.map.txt",
- versions: ["29", "30"],
+ versions: [
+ "29",
+ "30",
+ ],
},
}
diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index f25e954..635ea69 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -166,4 +166,5 @@
],
test_suites: ["device-tests"],
+ require_root: true,
}
diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index 96d5eb9..bf8b9f7 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -150,7 +150,7 @@
class DeathObserver : public IBinder::DeathRecipient {
SensorManager& mSensorManager;
virtual void binderDied(const wp<IBinder>& who) {
- ALOGW("sensorservice died [%p]", who.unsafe_get());
+ ALOGW("sensorservice died [%p]", static_cast<void*>(who.unsafe_get()));
mSensorManager.sensorManagerDied();
}
public:
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 1a0d8c0..2518e93 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -47,6 +47,7 @@
"-Wno-padded",
"-Wno-switch-enum",
+ "-Wno-format-pedantic",
],
sanitize: {
diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index df5f1eb..b0c4f3f 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -46,6 +46,7 @@
"-Wno-padded",
"-Wno-switch-enum",
"-Wno-undef",
+ "-Wno-format-pedantic",
// Have clang emit complete debug_info.
"-fstandalone-debug",