Revert of Make it possible to build libhardware.

third_party/hwcplus/src/hardware.c

 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include <hardware/hardware.h>
 
 #include <cutils/properties.h>
 
 #include <dlfcn.h>
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdlib.h>
 
 #define LOG_TAG "HAL"
-#ifdef ANDROID
 #include <utils/Log.h>
-#else
-#include <stdio.h>
-#include <unistd.h>
-#include <log/log.h>
-#endif
-
-#if defined(__LP64__)
-#define _64 "64"
-#else
-#define _64 ""
-#endif
 
 /** Base path of the hal modules */
-#ifndef HAL_LIBRARY_PATH1
-#define HAL_LIBRARY_PATH1 "/system/lib" _64 "/hw"
-#endif
-#ifndef HAL_LIBRARY_PATH2
-#define HAL_LIBRARY_PATH2 "/vendor/lib" _64 "/hw"
+#if defined(__LP64__)
+#define HAL_LIBRARY_PATH1 "/system/lib64/hw"
+#define HAL_LIBRARY_PATH2 "/vendor/lib64/hw"
+#else
+#define HAL_LIBRARY_PATH1 "/system/lib/hw"
+#define HAL_LIBRARY_PATH2 "/vendor/lib/hw"
 #endif
 
 /**
  * There are a set of variant filename for modules. The form of the filename
  * is "<MODULE_ID>.variant.so" so for the led module the Dream variants 
  * of base "ro.product.board", "ro.board.platform" and "ro.arch" would be:
  *
  * led.trout.so
  * led.msm7k.so
  * led.ARMV6.so
@@ skipping 75 matching lines @@
     return status;
 }
 
 /*
  * Check if a HAL with given name and subname exists, if so return 0, otherwise
  * otherwise return negative.  On success path will contain the path to the HAL.
  */
 static int hw_module_exists(char *path, size_t path_len, const char *name,
                             const char *subname)
 {
-    char *hal_library_path = getenv("HAL_LIBRARY_PATH");
-    if (hal_library_path) {
-        snprintf(path, path_len, "%s/%s.%s.so",
-                 hal_library_path, name, subname);
-        if (access(path, R_OK) == 0)
-            return 0;
-    }
-
     snprintf(path, path_len, "%s/%s.%s.so",
              HAL_LIBRARY_PATH2, name, subname);
     if (access(path, R_OK) == 0)
         return 0;
 
     snprintf(path, path_len, "%s/%s.%s.so",
              HAL_LIBRARY_PATH1, name, subname);
     if (access(path, R_OK) == 0)
         return 0;
 
@@ skipping 49 matching lines @@
 found:
     /* load the module, if this fails, we're doomed, and we should not try
      * to load a different variant. */
     return load(class_id, path, module);
 }
 
 int hw_get_module(const char *id, const struct hw_module_t **module)
 {
     return hw_get_module_by_class(id, NULL, module);
 }