ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty/test/binder: Add package support for modules that have AIDL interfaces"

Browse source
This commit is contained in:
Armelle Laine 2022-12-02 23:22:39 +00:00 • committed by Gerrit Code Review
commit c4108e917b
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trusty/test/binder/aidl/ByteEnum.aidl → trusty/test/binder/aidl/com/android/trusty/binder/test/ByteEnum.aidl
View file

@ -14,6 +14,8 @@
* limitations under the License.
*/
package com.android.trusty.binder.test;
/*
* Hello, world!
*/

7
trusty/test/binder/aidl/ITestService.aidl → trusty/test/binder/aidl/com/android/trusty/binder/test/ITestService.aidl
View file

@ -14,10 +14,11 @@
* limitations under the License.
*/
package com.android.trusty.binder.test;
import ByteEnum;
import IntEnum;
import LongEnum;
import com.android.trusty.binder.test.ByteEnum;
import com.android.trusty.binder.test.IntEnum;
import com.android.trusty.binder.test.LongEnum;
interface ITestService {
const @utf8InCpp String PORT = "com.android.trusty.binder.test.service";

2
trusty/test/binder/aidl/IntEnum.aidl → trusty/test/binder/aidl/com/android/trusty/binder/test/IntEnum.aidl
View file

@ -14,6 +14,8 @@
* limitations under the License.
*/
package com.android.trusty.binder.test;
@JavaDerive(toString=true)
@Backing(type="int")
enum IntEnum {

2
trusty/test/binder/aidl/LongEnum.aidl → trusty/test/binder/aidl/com/android/trusty/binder/test/LongEnum.aidl
View file

@ -14,6 +14,8 @@
* limitations under the License.
*/
package com.android.trusty.binder.test;
@Backing(type="long")
enum LongEnum {
FOO = 100000000000,

10
trusty/test/binder/aidl/rules.mk
View file

@ -17,10 +17,12 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_AIDL_PACKAGE := com/android/trusty/binder/test
MODULE_AIDLS := \
$(LOCAL_DIR)/ByteEnum.aidl \
$(LOCAL_DIR)/IntEnum.aidl \
$(LOCAL_DIR)/ITestService.aidl \
$(LOCAL_DIR)/LongEnum.aidl \
$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/ByteEnum.aidl \
$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/IntEnum.aidl \
$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/ITestService.aidl \
$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/LongEnum.aidl \
include make/aidl.mk