Revert "Ensuring builds compile for both 32 bit and 64 bit targets."

This reverts commit 85e093bc03d747f69b3ada658c9e82f442cda334.

Change-Id: I9346929e6016e36beb3b6949ccec9fce73da91c4

1 files changed, 4 insertions, 3 deletions

diff --git a/core/jni/android_hardware_location_ContextHubService.cpp b/core/jni/android_hardware_location_ContextHubService.cpp
index d05f82e2d2f3..8b476cf742a7 100644
--- a/core/jni/android_hardware_location_ContextHubService.cpp
+++ b/core/jni/android_hardware_location_ContextHubService.cpp
@@ -216,7 +216,7 @@ int add_app_instance(const hub_app_info *appInfo, uint32_t hubHandle, JNIEnv *en
     int appInstanceHandle = generate_id();
 
     if (appInstanceHandle < 0 || !appName || !entry || !name) {
-        ALOGE("Cannot find resources to add app instance %d, %p, %p",
+        ALOGE("Cannot find resources to add app instance %d, %d, %d",
             appInstanceHandle, appName, entry);
 
         free(appName);
@@ -360,7 +360,8 @@ int handle_query_apps_response(char *msg, int msgLen, uint32_t hubHandle) {
 
     memcpy(info, msg, msgLen);
     for (i = 0; i < numApps; i++) {
-        add_app_instance(&info[i], hubHandle, env);
+        add_app_instance(info, hubHandle, env);
+        info++;
     }
 
     free(info);
@@ -437,7 +438,7 @@ int context_hub_callback(uint32_t hubId,
     msgHeader[HEADER_FIELD_MSG_TYPE] = msg->message_type;
 
     if (!sanity_check_cookie(cookie, hubId)) {
-        ALOGW("Incorrect cookie %" PRId32 " for cookie %p! Bailing",
+        ALOGW("Incorrect cookie %" PRId32 " for cookie %lu! Bailing",
               hubId, cookie);
 
         return -1;