Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4108e91 authored by Armelle Laine's avatar Armelle Laine Committed by Gerrit Code Review
Browse files

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

parents c444569a d12c75f5

trusty/test/binder/aidl/ByteEnum.aidl→trusty/test/binder/aidl/com/android/trusty/binder/test/ByteEnum.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.trusty.binder.test;



/*

/*

 * Hello, world!

 * Hello, world!

 */

 */

trusty/test/binder/aidl/ITestService.aidl→trusty/test/binder/aidl/com/android/trusty/binder/test/ITestService.aidl

+4 −3
Original line number Original line Diff line number Diff line
@@ -14,10 +14,11 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.trusty.binder.test;





import ByteEnum;

import com.android.trusty.binder.test.ByteEnum;

import IntEnum;

import com.android.trusty.binder.test.IntEnum;

import LongEnum;

import com.android.trusty.binder.test.LongEnum;





interface ITestService {

interface ITestService {

    const @utf8InCpp String PORT = "com.android.trusty.binder.test.service";

    const @utf8InCpp String PORT = "com.android.trusty.binder.test.service";

trusty/test/binder/aidl/IntEnum.aidl→trusty/test/binder/aidl/com/android/trusty/binder/test/IntEnum.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.trusty.binder.test;



@JavaDerive(toString=true)

@JavaDerive(toString=true)

@Backing(type="int")

@Backing(type="int")

enum IntEnum {

enum IntEnum {

trusty/test/binder/aidl/LongEnum.aidl→trusty/test/binder/aidl/com/android/trusty/binder/test/LongEnum.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.trusty.binder.test;



@Backing(type="long")

@Backing(type="long")

enum LongEnum {

enum LongEnum {

    FOO = 100000000000,

    FOO = 100000000000,

trusty/test/binder/aidl/rules.mk

+6 −4
Original line number Original line Diff line number Diff line
@@ -17,10 +17,12 @@ LOCAL_DIR := $(GET_LOCAL_DIR) 




MODULE := $(LOCAL_DIR)

MODULE := $(LOCAL_DIR)





MODULE_AIDL_PACKAGE := com/android/trusty/binder/test



MODULE_AIDLS := \

MODULE_AIDLS := \

	$(LOCAL_DIR)/ByteEnum.aidl \

	$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/ByteEnum.aidl \

	$(LOCAL_DIR)/IntEnum.aidl \

	$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/IntEnum.aidl \

	$(LOCAL_DIR)/ITestService.aidl \

	$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/ITestService.aidl \

	$(LOCAL_DIR)/LongEnum.aidl \

	$(LOCAL_DIR)/$(MODULE_AIDL_PACKAGE)/LongEnum.aidl \





include make/aidl.mk
 
include make/aidl.mk