tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "move_fmq" am: 1fa07549e1 am: 1af8658a9b am: f88f876f3d am: c11d5fcc1f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1456140

Change-Id: Ie0e659de876786a0e539f092d7fc349b86d70c14
This commit is contained in:
Devin Moore 2020-10-13 16:14:18 +00:00 committed by Automerger Merge Worker
commit 1e30fc4ff1
11 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/fmq/aidl/Android.bp Normal file
View file

@ -0,0 +1,21 @@
aidl_interface {
name: "android.hardware.common.fmq",
host_supported: true,
vendor_available: true,
vndk: {
enabled: true,
support_system_process: true,
},
srcs: [
"android/hardware/common/fmq/*.aidl",
],
stability: "vintf",
backend: {
java: {
enabled: false,
},
cpp: {
enabled: false,
},
},
}

2
common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl → common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/GrantorDescriptor.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.common;
package android.hardware.common.fmq;
@VintfStability
parcelable GrantorDescriptor {
int offset;

4
common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/MQDescriptor.aidl → common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl
View file

@ -15,10 +15,10 @@
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.common;
package android.hardware.common.fmq;
@VintfStability
parcelable MQDescriptor {
android.hardware.common.GrantorDescriptor[] grantors;
android.hardware.common.fmq.GrantorDescriptor[] grantors;
ParcelFileDescriptor fileDescriptor;
int quantum;
int flags;

2
common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/SynchronizedReadWrite.aidl → common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.common;
package android.hardware.common.fmq;
@VintfStability
enum SynchronizedReadWrite {
EMPTY = 0,

2
common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/UnsynchronizedWrite.aidl → common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.common;
package android.hardware.common.fmq;
@VintfStability
enum UnsynchronizedWrite {
EMPTY = 0,

2
common/aidl/android/hardware/common/GrantorDescriptor.aidl → common/fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.common;
package android.hardware.common.fmq;
/*
* Included in MQDescriptor, for use with libfmq.

4
common/aidl/android/hardware/common/MQDescriptor.aidl → common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl
View file

@ -14,9 +14,9 @@
* limitations under the License.
*/
package android.hardware.common;
package android.hardware.common.fmq;
import android.hardware.common.GrantorDescriptor;
import android.hardware.common.fmq.GrantorDescriptor;
/*
* For use with libfmq. This is created from an instance of AidlMessageQueue,

2
common/aidl/android/hardware/common/SynchronizedReadWrite.aidl → common/fmq/aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.common;
package android.hardware.common.fmq;
/*
* For use with android.hardware.common.MQDescriptor to specify which type of

2
common/aidl/android/hardware/common/UnsynchronizedWrite.aidl → common/fmq/aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.common;
package android.hardware.common.fmq;
/*
* For use with android.hardware.common.MQDescriptor to specify which type of

1
compatibility_matrices/exclude/fcm_exclude.cpp
View file

@ -53,6 +53,7 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) {
// AIDL
"android.hardware.biometrics.common",
"android.hardware.common",
"android.hardware.common.fmq",
"android.hardware.graphics.common",
"android.hardware.keymaster",

2
tests/msgq/1.0/default/Android.bp
View file

@ -93,7 +93,7 @@ cc_test {
static_libs: [
"android.hardware.tests.msgq@1.0",
"android.fmq.test-ndk_platform",
"android.hardware.common-unstable-ndk_platform",
"android.hardware.common.fmq-unstable-ndk_platform",
],
whole_static_libs: [
"android.hardware.tests.msgq@1.0-impl",