From 712f24a59fd7b79449842945d7d383cc4559a68b Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Wed, 25 Mar 2015 23:10:19 +0100 Subject: [PATCH] Fix Android.mk --- Android.mk | 3 ++- .../aidl/com/google/android/auth/IAuthManagerService.aidl | 2 ++ .../com/google/android/gms/common/internal/IGmsCallbacks.aidl | 2 ++ .../google/android/gms/common/internal/IGmsServiceBroker.aidl | 2 ++ .../gms/location/internal/IGoogleLocationManagerService.aidl | 4 ++++ .../google/android/gms/maps/internal/IGoogleMapDelegate.aidl | 2 ++ .../android/gms/maps/internal/IMapFragmentDelegate.aidl | 2 ++ .../google/android/gms/maps/internal/IMapViewDelegate.aidl | 2 ++ .../google/android/gms/people/internal/IPeopleCallbacks.aidl | 2 ++ .../google/android/gms/people/internal/IPeopleService.aidl | 2 ++ 10 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index fb4008de..74850272 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := GmsApi LOCAL_SRC_FILES := $(call all-java-files-under, play-services-api/src/main/java) -LOCAL_SRC_FILES := $(call all-Iaidl-files-under, play-services-api/src/main/aidl) +LOCAL_SRC_FILES += $(call all-Iaidl-files-under, play-services-api/src/main/aidl) +LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/play-services-api/src/main/aidl LOCAL_STATIC_JAVA_LIBRARIES := SafeParcel include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl index 94ced65c..ac46a323 100644 --- a/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl +++ b/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl @@ -1,5 +1,7 @@ package com.google.android.auth; +import android.os.Bundle; + import com.google.android.gms.auth.AccountChangeEventsResponse; import com.google.android.gms.auth.AccountChangeEventsRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl index 9a36b0ed..b0210281 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.common.internal; +import android.os.Bundle; + interface IGmsCallbacks { void onPostInitComplete(int statusCode, IBinder binder, in Bundle params); } diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl index 318c4dab..185b394a 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.common.internal; +import android.os.Bundle; + import com.google.android.gms.common.internal.IGmsCallbacks; interface IGmsServiceBroker { diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl index a60350fd..e2fb3acc 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl @@ -1,5 +1,9 @@ package com.google.android.gms.location.internal; +import android.app.PendingIntent; +import android.location.Location; +import android.os.Bundle; + import com.google.android.gms.location.places.AutocompleteFilter; import com.google.android.gms.location.places.internal.IPlacesCallbacks; import com.google.android.gms.location.internal.LocationRequestInternal; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl index ac474c35..ae5e402b 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.maps.internal; +import android.location.Location; + import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.maps.model.CameraPosition; import com.google.android.gms.maps.internal.ICancelableCallback; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl index 966c4e4b..ebfee0d1 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.maps.internal; +import android.os.Bundle; + import com.google.android.gms.maps.internal.IGoogleMapDelegate; import com.google.android.gms.maps.GoogleMapOptions; import com.google.android.gms.dynamic.IObjectWrapper; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl index 820e27b4..2efb5649 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.maps.internal; +import android.os.Bundle; + import com.google.android.gms.maps.internal.IGoogleMapDelegate; import com.google.android.gms.dynamic.IObjectWrapper; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl index 8738a9ea..66b35e43 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.people.internal; +import android.os.Bundle; + import com.google.android.gms.common.data.DataHolder; interface IPeopleCallbacks { diff --git a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl index e399cd02..d50aee4a 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl @@ -1,5 +1,7 @@ package com.google.android.gms.people.internal; +import android.os.Bundle; + import com.google.android.gms.people.internal.IPeopleCallbacks; import com.google.android.gms.common.server.FavaDiagnosticsEntity; import com.google.android.gms.common.internal.ICancelToken;