diff options
| -rw-r--r-- | Android.mk | 15 | ||||
| -rw-r--r-- | uevent/Android.mk | 4 | ||||
| -rw-r--r-- | uevent/uevent_stub.c | 33 |
3 files changed, 2 insertions, 50 deletions
@@ -13,24 +13,13 @@ LOCAL_SHARED_LIBRARIES := libcutils libwpa_client LOCAL_INCLUDES += $(LOCAL_PATH) -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_CFLAGS += -DQEMU_HARDWARE - QEMU_HARDWARE := true -endif +LOCAL_CFLAGS += -DQEMU_HARDWARE +QEMU_HARDWARE := true -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl -endif include $(SAVE_MAKEFILES) -# need "-lrt" on Linux simulator to pick up clock_gettime -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - LOCAL_LDLIBS += -lrt -lpthread -ldl - endif -endif - LOCAL_MODULE:= libhardware_legacy include $(BUILD_SHARED_LIBRARY) diff --git a/uevent/Android.mk b/uevent/Android.mk index 74ccdbc..2d8b524 100644 --- a/uevent/Android.mk +++ b/uevent/Android.mk @@ -1,7 +1,3 @@ # Copyright 2008 The Android Open Source Project -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_SRC_FILES += uevent/uevent_stub.c -else LOCAL_SRC_FILES += uevent/uevent.c -endif diff --git a/uevent/uevent_stub.c b/uevent/uevent_stub.c deleted file mode 100644 index 2f28ab4..0000000 --- a/uevent/uevent_stub.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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_legacy/uevent.h> -#include <unistd.h> - -int uevent_init() -{ - return 1; -} - -int uevent_next_event(char* buffer, int buffer_length) -{ - while (1) { - sleep(10000); - } - - // won't get here - return 0; -} |